aboutsummaryrefslogtreecommitdiffstats
path: root/native
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2014-04-04 13:46:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-04 13:46:48 +0000
commit68e50c287e42b3a3eeaf6c82f636576a12f4651b (patch)
tree6508324d80f4ddccdadda6e507351e6723828a87 /native
parent40f33edaf1e169556b007edf49247eb11d442c83 (diff)
parentdcc43891e76eb3b6c1674705be60c5798bd16386 (diff)
downloadlatinime-68e50c287e42b3a3eeaf6c82f636576a12f4651b.tar.gz
latinime-68e50c287e42b3a3eeaf6c82f636576a12f4651b.tar.xz
latinime-68e50c287e42b3a3eeaf6c82f636576a12f4651b.zip
am dcc43891: Merge "Remove redundant LOCAL_IS_HOST_MODULE assignments"
* commit 'dcc43891e76eb3b6c1674705be60c5798bd16386': Remove redundant LOCAL_IS_HOST_MODULE assignments
Diffstat (limited to 'native')
-rw-r--r--native/jni/HostUnitTests.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/native/jni/HostUnitTests.mk b/native/jni/HostUnitTests.mk
index 967099a53..572d36564 100644
--- a/native/jni/HostUnitTests.mk
+++ b/native/jni/HostUnitTests.mk
@@ -29,10 +29,8 @@ LATIN_IME_SRC_DIR := src
LOCAL_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function
LOCAL_CLANG := true
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
-LOCAL_IS_HOST_MODULE := true
LOCAL_MODULE := liblatinime_host_static_for_unittests
LOCAL_MODULE_TAGS := optional
-LOCAL_NDK_STL_VARIANT := c++_static
LOCAL_SRC_FILES := $(addprefix $(LATIN_IME_SRC_DIR)/, $(LATIN_IME_CORE_SRC_FILES))
include $(BUILD_HOST_STATIC_LIBRARY)
@@ -43,10 +41,8 @@ LATIN_IME_TEST_SRC_DIR := tests
LOCAL_CFLAGS += -std=c++11 -Wno-unused-parameter -Wno-unused-function
LOCAL_CLANG := true
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR)
-LOCAL_IS_HOST_MODULE := true
LOCAL_MODULE := liblatinime_host_unittests
LOCAL_MODULE_TAGS := tests
-LOCAL_NDK_STL_VARIANT := c++_static
LOCAL_SRC_FILES := $(addprefix $(LATIN_IME_TEST_SRC_DIR)/, $(LATIN_IME_CORE_TEST_FILES))
LOCAL_STATIC_LIBRARIES += liblatinime_host_static_for_unittests libgtest_host libgtest_main_host
include $(BUILD_HOST_NATIVE_TEST)