diff options
| author |   Dan Albert <danalbert@google.com> | 2016-03-24 01:34:51 +0000 |
|---|---|---|
| committer |   android-build-merger <android-build-merger@google.com> | 2016-03-24 01:34:51 +0000 |
| commit | eee3201c74faa86448df8c6ae3e5c5f356042a08 (patch) | |
| tree | 159a06111ab05547e2d50067378cd05278b862e6 | |
| parent | 126c6bdd2555463b457d5a42fe8f665cda921072 (diff) | |
| parent | b0d902f2e4f90ee4fd0eda46fa16133bdd2d09d8 (diff) | |
| download | latinime-eee3201c74faa86448df8c6ae3e5c5f356042a08.tar.gz latinime-eee3201c74faa86448df8c6ae3e5c5f356042a08.tar.xz latinime-eee3201c74faa86448df8c6ae3e5c5f356042a08.zip | |
Merge "Stop mixing and matching platform and NDK."
am: b0d902f
* commit 'b0d902f2e4f90ee4fd0eda46fa16133bdd2d09d8':
Stop mixing and matching platform and NDK.
| -rw-r--r-- | native/jni/TargetUnitTests.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/native/jni/TargetUnitTests.mk b/native/jni/TargetUnitTests.mk index ae838233f..eefd4fcf3 100644 --- a/native/jni/TargetUnitTests.mk +++ b/native/jni/TargetUnitTests.mk @@ -27,10 +27,8 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) 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_MODULE_TAGS := tests 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 |