diff options
| author |   Treehugger Robot <treehugger-gerrit@google.com> | 2017-09-11 20:58:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-11 20:58:08 +0000 |
| commit | ad5da5881dcaf3a1b4ec0cbdda51401460b6e37a (patch) | |
| tree | 5d423b97e908b8efeda0509f09f37b0455133b27 /native | |
| parent | cfc834197c6e2ae6bdff1b7e4cde47cf0a2c0dd4 (diff) | |
| parent | afca081fc3f6ad3fd47ccbae92ebaf3319113881 (diff) | |
| download | latinime-ad5da5881dcaf3a1b4ec0cbdda51401460b6e37a.tar.gz latinime-ad5da5881dcaf3a1b4ec0cbdda51401460b6e37a.tar.xz latinime-ad5da5881dcaf3a1b4ec0cbdda51401460b6e37a.zip | |
Merge "Remove LOCAL_CLANG"
Diffstat (limited to 'native')
| -rw-r--r-- | native/dicttoolkit/Android.mk | 1 | ||||
| -rw-r--r-- | native/dicttoolkit/UnitTests.mk | 2 | ||||
| -rw-r--r-- | native/jni/Android.mk | 2 | ||||
| -rw-r--r-- | native/jni/HostUnitTests.mk | 2 | ||||
| -rw-r--r-- | native/jni/TargetUnitTests.mk | 2 |
5 files changed, 0 insertions, 9 deletions
diff --git a/native/dicttoolkit/Android.mk b/native/dicttoolkit/Android.mk index 4befecf4a..7a446860c 100644 --- a/native/dicttoolkit/Android.mk +++ b/native/dicttoolkit/Android.mk @@ -51,7 +51,6 @@ LOCAL_SRC_FILES := $(LATIN_IME_DICT_TOOLKIT_MAIN_SRC_FILES) \ LOCAL_MODULE := dicttoolkit LOCAL_MODULE_TAGS := optional -LOCAL_CLANG := true LOCAL_CXX_STL := libc++ include $(BUILD_HOST_EXECUTABLE) diff --git a/native/dicttoolkit/UnitTests.mk b/native/dicttoolkit/UnitTests.mk index da1b3767c..55177c084 100644 --- a/native/dicttoolkit/UnitTests.mk +++ b/native/dicttoolkit/UnitTests.mk @@ -31,7 +31,6 @@ include $(LATIN_IME_CORE_PATH)/NativeFileList.mk LATIN_IME_SRC_DIR := src LOCAL_ADDRESS_SANITIZER := true LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function -LOCAL_CLANG := true LOCAL_CXX_STL := libc++ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_DICT_TOOLKIT_SRC_DIR) \ $(LATIN_IME_CORE_PATH)/$(LATIN_IME_CORE_SRC_DIR) @@ -46,7 +45,6 @@ include $(CLEAR_VARS) LOCAL_ADDRESS_SANITIZER := true LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function -LOCAL_CLANG := true LOCAL_CXX_STL := libc++ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_DICT_TOOLKIT_SRC_DIR) \ $(LATIN_IME_CORE_PATH)/$(LATIN_IME_CORE_SRC_DIR) diff --git a/native/jni/Android.mk b/native/jni/Android.mk index 6003a6f64..01b32a95e 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -63,7 +63,6 @@ endif # FLAG_DO_PROFILE LOCAL_MODULE := libjni_latinime_common_static LOCAL_MODULE_TAGS := optional -LOCAL_CLANG := true LOCAL_SDK_VERSION := 14 LOCAL_NDK_STL_VARIANT := c++_static @@ -87,7 +86,6 @@ endif # FLAG_DO_PROFILE LOCAL_MODULE := libjni_latinime LOCAL_MODULE_TAGS := optional -LOCAL_CLANG := true LOCAL_SDK_VERSION := 14 LOCAL_NDK_STL_VARIANT := c++_static LOCAL_LDFLAGS += -ldl diff --git a/native/jni/HostUnitTests.mk b/native/jni/HostUnitTests.mk index 6a8bcec2d..6dd615cf7 100644 --- a/native/jni/HostUnitTests.mk +++ b/native/jni/HostUnitTests.mk @@ -30,7 +30,6 @@ include $(LOCAL_PATH)/NativeFileList.mk LATIN_IME_SRC_DIR := src LOCAL_ADDRESS_SANITIZER := true LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function -LOCAL_CLANG := true LOCAL_CXX_STL := libc++ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) LOCAL_MODULE := liblatinime_host_static_for_unittests @@ -43,7 +42,6 @@ include $(CLEAR_VARS) LATIN_IME_TEST_SRC_DIR := tests LOCAL_ADDRESS_SANITIZER := true LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function -LOCAL_CLANG := true LOCAL_CXX_STL := libc++ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) LOCAL_MODULE := liblatinime_host_unittests diff --git a/native/jni/TargetUnitTests.mk b/native/jni/TargetUnitTests.mk index 69a32edbd..b05cd1401 100644 --- a/native/jni/TargetUnitTests.mk +++ b/native/jni/TargetUnitTests.mk @@ -22,7 +22,6 @@ include $(LOCAL_PATH)/NativeFileList.mk #################### Target library for unit test LATIN_IME_SRC_DIR := src LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function -LOCAL_CLANG := true LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) LOCAL_MODULE := liblatinime_target_static_for_unittests LOCAL_MODULE_TAGS := optional @@ -35,7 +34,6 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LATIN_IME_TEST_SRC_DIR := tests LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function -LOCAL_CLANG := true LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) LOCAL_MODULE := liblatinime_target_unittests LOCAL_MODULE_TAGS := tests |