diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-26 20:37:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-26 20:37:45 +0000 |
| commit | be0656e745b4c8e5bfd7efaa44d5dc4367375d72 (patch) | |
| tree | 17f8b9db0f57c2c824d93edcba25dc749312c048 | |
| parent | fa3c26b862ca17c0d2db67606226b49d1648b4bf (diff) | |
| parent | f839a186dec4e594b5c60aaa487a8497dc84766f (diff) | |
| download | gtest-l-preview.tar.gz | |
Merge "Don't manually link stlport."android-l-preview_r2ub-tools-idea133-releasel-preview
| -rw-r--r-- | test/Android.mk | 7 |
1 files 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)) \ |