From f839a186dec4e594b5c60aaa487a8497dc84766f Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 26 Sep 2014 12:58:58 -0700 Subject: Don't manually link stlport. Change-Id: I40f9e647ddf8160fd08cc0baef56e1d7fc77a65f --- test/Android.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/Android.mk b/test/Android.mk index 60640aa..6e4d4b9 100644 --- a/test/Android.mk +++ b/test/Android.mk @@ -27,15 +27,15 @@ libgtest_test_common_includes := \ $(LOCAL_PATH)/../include \ $(LOCAL_PATH)/.. -libgtest_test_includes := $(libgtest_test_common_includes) bionic external/stlport/stlport +libgtest_test_includes := $(libgtest_test_common_includes) libgtest_test_static_lib := libgtest_main libgtest -libgtest_test_shared_lib := libstlport libgtest_test_ldflags := +libgtest_test_cxx_stl := stlport libgtest_test_host_includes := $(libgtest_test_common_includes) libgtest_test_host_static_lib := libgtest_main_host libgtest_host -libgtest_test_host_shared_lib := libgtest_test_host_ldflags := -lpthread +libgtest_test_host_cxx_stl := default # $(2) and $(4) must be set or cleared in sync. $(2) is used to # generate the right make target (host vs device). $(4) is used in the @@ -59,6 +59,7 @@ $(foreach file,$(1), \ $(eval LOCAL_LDFLAGS += $(libgtest_test$(4)_ldflags)) \ $(eval LOCAL_STATIC_LIBRARIES := $(libgtest_test$(4)_static_lib)) \ $(eval LOCAL_SHARED_LIBRARIES := $(libgtest_test$(4)_shared_lib)) \ + $(eval LOCAL_CXX_STL := $(libgtest_test$(4)_cxx_stl)) \ $(if $(2),,$(eval LOCAL_MODULE_TAGS := tests)) \ $(eval LOCAL_MODULE_PATH := $($(5))) \ $(eval include $(BUILD_$(2)EXECUTABLE)) \ -- cgit v1.2.3