aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-09-12 08:09:52 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-09-12 08:09:52 +0000
commit7f92ef16190875214e094b030e768ff7410d5bbe (patch)
treea06e403642e3814c106d87e66e6f07221852097d
parentb9d4ed437da9b5c6fcb701cd5a3033c9108c3a2e (diff)
parentf3f24832b5055645a75af56e419eb2328ab95b56 (diff)
downloadlatinime-7f92ef16190875214e094b030e768ff7410d5bbe.tar.gz
latinime-7f92ef16190875214e094b030e768ff7410d5bbe.tar.xz
latinime-7f92ef16190875214e094b030e768ff7410d5bbe.zip
release-request-07e0701a-6024-4964-a0bf-f87d472b7ee2-for-git_pi-release-4329913 snap-temp-L73100000101564133
Change-Id: I40058387aa32deb2b4f857338d397cf8f422c62c
-rw-r--r--native/dicttoolkit/Android.mk1
-rw-r--r--native/dicttoolkit/UnitTests.mk2
-rw-r--r--native/jni/Android.mk2
-rw-r--r--native/jni/HostUnitTests.mk2
-rw-r--r--native/jni/TargetUnitTests.mk2
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