Merge "Stop mixing and matching platform and NDK." am: b0d902f
am: eee3201
* commit 'eee3201c74faa86448df8c6ae3e5c5f356042a08':
Stop mixing and matching platform and NDK.
diff --git a/native/jni/TargetUnitTests.mk b/native/jni/TargetUnitTests.mk
index ae83823..eefd4fc 100644
--- a/native/jni/TargetUnitTests.mk
+++ b/native/jni/TargetUnitTests.mk
@@ -27,10 +27,8 @@
LOCAL_MODULE := liblatinime_target_static_for_unittests
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(addprefix $(LATIN_IME_SRC_DIR)/, $(LATIN_IME_CORE_SRC_FILES))
-# Here intentionally use libc++_shared rather than libc++_static because
-# $(BUILD_NATIVE_TEST) has not yet supported libc++_static.
LOCAL_SDK_VERSION := 14
-LOCAL_NDK_STL_VARIANT := c++_shared
+LOCAL_NDK_STL_VARIANT := c++_static
include $(BUILD_STATIC_LIBRARY)
#################### Target native tests
@@ -44,6 +42,8 @@
LOCAL_SRC_FILES := \
$(addprefix $(LATIN_IME_TEST_SRC_DIR)/, $(LATIN_IME_CORE_TEST_FILES))
LOCAL_STATIC_LIBRARIES += liblatinime_target_static_for_unittests
+LOCAL_SDK_VERSION := 14
+LOCAL_NDK_STL_VARIANT := c++_static
include $(BUILD_NATIVE_TEST)
#################### Clean up the tmp vars