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

* commit '06e62ab24e0b90707ab92da26e0726405ed7856e':
  Remove uses of libcxx.mk.
main
Dan Albert 2015-03-27 23:19:17 +00:00 committed by Android Git Automerger
commit 9ce2d0bb37
1 changed files with 0 additions and 3 deletions

View File

@ -44,9 +44,6 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(addprefix $(LATIN_IME_TEST_SRC_DIR)/, $(LATIN_IME_CORE_TEST_FILES)) $(addprefix $(LATIN_IME_TEST_SRC_DIR)/, $(LATIN_IME_CORE_TEST_FILES))
LOCAL_STATIC_LIBRARIES += liblatinime_target_static_for_unittests 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) include $(BUILD_NATIVE_TEST)
#################### Clean up the tmp vars #################### Clean up the tmp vars