nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Remove LOCAL_CLANG" am: ad5da5881d am: bd750da7f1 

am: 584a03ec4a

Change-Id: I6b1d4324025169ab46112c7a90ef922ec2da2a8c
main
Lennart Wieboldt 2017-09-11 21:45:22 +00:00 committed by android-build-merger
parent 9f14e616ab 584a03ec4a
commit da0846165e
5 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
native/dicttoolkit/Android.mk
View File

@ -51,7 +51,6 @@ LOCAL_SRC_FILES := $(LATIN_IME_DICT_TOOLKIT_MAIN_SRC_FILES) \
LOCAL_MODULE := dicttoolkit LOCAL_MODULE := dicttoolkit
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CLANG := true
LOCAL_CXX_STL := libc++ LOCAL_CXX_STL := libc++
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)

2
native/dicttoolkit/UnitTests.mk
View File

@ -31,7 +31,6 @@ include $(LATIN_IME_CORE_PATH)/NativeFileList.mk
LATIN_IME_SRC_DIR := src LATIN_IME_SRC_DIR := src
LOCAL_ADDRESS_SANITIZER := true LOCAL_ADDRESS_SANITIZER := true
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
LOCAL_CLANG := true
LOCAL_CXX_STL := libc++ LOCAL_CXX_STL := libc++
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_DICT_TOOLKIT_SRC_DIR) \ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_DICT_TOOLKIT_SRC_DIR) \
$(LATIN_IME_CORE_PATH)/$(LATIN_IME_CORE_SRC_DIR) $(LATIN_IME_CORE_PATH)/$(LATIN_IME_CORE_SRC_DIR)
@ -46,7 +45,6 @@ include $(CLEAR_VARS)
LOCAL_ADDRESS_SANITIZER := true LOCAL_ADDRESS_SANITIZER := true
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
LOCAL_CLANG := true
LOCAL_CXX_STL := libc++ LOCAL_CXX_STL := libc++
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_DICT_TOOLKIT_SRC_DIR) \ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_DICT_TOOLKIT_SRC_DIR) \
$(LATIN_IME_CORE_PATH)/$(LATIN_IME_CORE_SRC_DIR) $(LATIN_IME_CORE_PATH)/$(LATIN_IME_CORE_SRC_DIR)

2
native/jni/Android.mk
View File

@ -63,7 +63,6 @@ endif # FLAG_DO_PROFILE
LOCAL_MODULE := libjni_latinime_common_static LOCAL_MODULE := libjni_latinime_common_static
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CLANG := true
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_NDK_STL_VARIANT := c++_static LOCAL_NDK_STL_VARIANT := c++_static
@ -87,7 +86,6 @@ endif # FLAG_DO_PROFILE
LOCAL_MODULE := libjni_latinime LOCAL_MODULE := libjni_latinime
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CLANG := true
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_NDK_STL_VARIANT := c++_static LOCAL_NDK_STL_VARIANT := c++_static
LOCAL_LDFLAGS += -ldl LOCAL_LDFLAGS += -ldl

2
native/jni/HostUnitTests.mk
View File

@ -30,7 +30,6 @@ include $(LOCAL_PATH)/NativeFileList.mk
LATIN_IME_SRC_DIR := src LATIN_IME_SRC_DIR := src
LOCAL_ADDRESS_SANITIZER := true LOCAL_ADDRESS_SANITIZER := true
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
LOCAL_CLANG := true
LOCAL_CXX_STL := libc++ LOCAL_CXX_STL := libc++
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
LOCAL_MODULE := liblatinime_host_static_for_unittests LOCAL_MODULE := liblatinime_host_static_for_unittests
@ -43,7 +42,6 @@ include $(CLEAR_VARS)
LATIN_IME_TEST_SRC_DIR := tests LATIN_IME_TEST_SRC_DIR := tests
LOCAL_ADDRESS_SANITIZER := true LOCAL_ADDRESS_SANITIZER := true
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
LOCAL_CLANG := true
LOCAL_CXX_STL := libc++ LOCAL_CXX_STL := libc++
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
LOCAL_MODULE := liblatinime_host_unittests LOCAL_MODULE := liblatinime_host_unittests

2
native/jni/TargetUnitTests.mk
View File

@ -22,7 +22,6 @@ include $(LOCAL_PATH)/NativeFileList.mk
#################### Target library for unit test #################### Target library for unit test
LATIN_IME_SRC_DIR := src LATIN_IME_SRC_DIR := src
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
LOCAL_CLANG := true
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
LOCAL_MODULE := liblatinime_target_static_for_unittests LOCAL_MODULE := liblatinime_target_static_for_unittests
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
@ -35,7 +34,6 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LATIN_IME_TEST_SRC_DIR := tests LATIN_IME_TEST_SRC_DIR := tests
LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
LOCAL_CLANG := true
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
LOCAL_MODULE := liblatinime_target_unittests LOCAL_MODULE := liblatinime_target_unittests
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests