diff options
| author |   Dan Albert <danalbert@google.com> | 2015-03-27 23:19:17 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2015-03-27 23:19:17 +0000 |
| commit | 9ce2d0bb3702f2854e612cb743f4c508dd590981 (patch) | |
| tree | 9449545e7ffcd7cdad529bd9225f190f138efe1d | |
| parent | bda36acf3e68ddec2dc9e0a73b057b2c647d6cb7 (diff) | |
| parent | 06e62ab24e0b90707ab92da26e0726405ed7856e (diff) | |
| download | latinime-9ce2d0bb3702f2854e612cb743f4c508dd590981.tar.gz latinime-9ce2d0bb3702f2854e612cb743f4c508dd590981.tar.xz latinime-9ce2d0bb3702f2854e612cb743f4c508dd590981.zip | |
am 06e62ab2: am cc47075c: Merge "Remove uses of libcxx.mk."
* commit '06e62ab24e0b90707ab92da26e0726405ed7856e':
Remove uses of libcxx.mk.
| -rw-r--r-- | native/jni/TargetUnitTests.mk | 3 |
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 |