Merge "Remove redundant LOCAL_IS_HOST_MODULE assignments" (dcc43891) · Commits · e / os / android_packages_inputmethods_LatinIME

native/jni/HostUnitTests.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -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)

+0 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,6 @@ LOCAL_JAVA_LIBRARIES := junit
		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

+0 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,6 @@ LOCAL_SRC_FILES := \
		$(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)