commit 694114feca9647a282ce64ff36f43bbdc6a39678
author Ken Wakasa <kwakasa@google.com> Fri Apr 04 22:32:45 2014 +0900
committer Ken Wakasa <kwakasa@google.com> Fri Apr 04 22:32:45 2014 +0900
tree db52bddf6221430a7cd14db3a5237c39a3fd5ba9
parent 73fe49523b70b0cf649fa7fc0f096f91431f44f0

Remove redundant LOCAL_IS_HOST_MODULE assignments

Also, remove irrelevant LOCAL_NDK_STL_VARIANT for host modules.

Change-Id: I45e916c11f7c1f9b13956f01274a82ee7de1f558

native/jni/HostUnitTests.mk

diff --git a/native/jni/HostUnitTests.mk b/native/jni/HostUnitTests.mk
index 967099a..572d365 100644
--- a/native/jni/HostUnitTests.mk
+++ b/native/jni/HostUnitTests.mk
@@ -29,10 +29,8 @@
 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 @@
 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)

tools/dicttool/Android.mk

diff --git a/tools/dicttool/Android.mk b/tools/dicttool/Android.mk
index f49dee7..e12d7e0 100644
--- a/tools/dicttool/Android.mk
+++ b/tools/dicttool/Android.mk
@@ -85,7 +85,6 @@
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LATINIME_HOST_NATIVE_LIBNAME)
 LOCAL_JAR_MANIFEST := etc/manifest.txt
 LOCAL_MODULE := dicttool_aosp
-LOCAL_IS_HOST_MODULE := true
 
 include $(BUILD_HOST_JAVA_LIBRARY)
 include $(LOCAL_PATH)/etc/Android.mk

tools/dicttool/NativeLib.mk

diff --git a/tools/dicttool/NativeLib.mk b/tools/dicttool/NativeLib.mk
index 3044449..7403448 100644
--- a/tools/dicttool/NativeLib.mk
+++ b/tools/dicttool/NativeLib.mk
@@ -46,7 +46,6 @@
     $(addprefix $(LATINIME_NATIVE_SRC_DIR)/, $(LATIN_IME_CORE_SRC_FILES))
 
 LOCAL_MODULE := $(LATINIME_HOST_NATIVE_LIBNAME)
-LOCAL_IS_HOST_MODULE := true
 
 include $(BUILD_HOST_SHARED_LIBRARY)