aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-03-27 18:42:00 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-03-27 18:42:01 +0000
commitcc47075cd72d3649433c7a69ae5c88669a56646d (patch)
tree58341e66e7903c6fa2cf732beac1a2a8d7804cb9
parent3d6f78121b50f587546ea8dd6830d1f2e96fd5c4 (diff)
parent48fc8fde2ff1e371706799ca91a1ef05a8363c50 (diff)
downloadlatinime-cc47075cd72d3649433c7a69ae5c88669a56646d.tar.gz
latinime-cc47075cd72d3649433c7a69ae5c88669a56646d.tar.xz
latinime-cc47075cd72d3649433c7a69ae5c88669a56646d.zip
Merge "Remove uses of libcxx.mk."
-rw-r--r--native/jni/TargetUnitTests.mk3
1 files changed, 0 insertions, 3 deletions
diff --git a/native/jni/TargetUnitTests.mk b/native/jni/TargetUnitTests.mk
index 12aae44ea..ae838233f 100644
--- a/native/jni/TargetUnitTests.mk
+++ b/native/jni/TargetUnitTests.mk
@@ -44,9 +44,6 @@ 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
-# Here intentionally include external/libcxx/libcxx.mk rather because
-# $(BUILD_NATIVE_TEST) fails when LOCAL_NDK_STL_VARIANT is specified.
-include external/libcxx/libcxx.mk
include $(BUILD_NATIVE_TEST)
#################### Clean up the tmp vars