commit 4b43b8798c5ed01b78f96a664f01f2111323fea8
author Dan Albert <danalbert@google.com> Fri Mar 27 23:31:41 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 27 23:31:41 2015 +0000
tree d082b9cde92a8cad12c6dec578107fdc1304acbf
parent 6e33dcd58f37ef198ec40ac33d68bb8f9c12acff
parent 9ce2d0bb3702f2854e612cb743f4c508dd590981

am 9ce2d0bb: am 06e62ab2: am cc47075c: Merge "Remove uses of libcxx.mk."

* commit '9ce2d0bb3702f2854e612cb743f4c508dd590981':
  Remove uses of libcxx.mk.

native/jni/TargetUnitTests.mk

diff --git a/native/jni/TargetUnitTests.mk b/native/jni/TargetUnitTests.mk
index 12aae44..ae83823 100644
--- a/native/jni/TargetUnitTests.mk
+++ b/native/jni/TargetUnitTests.mk
@@ -44,9 +44,6 @@
 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