diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-11 16:19:59 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-11-11 17:45:45 -0800 |
| commit | 8914f71cc049e0fdeee9f0e10c1e74ba44db2876 (patch) | |
| tree | 919ac11b780b95bd026b807c9ec93277bd593b70 /core/target_test_internal.mk | |
| parent | 201f6b3e92a2ef2f3a117f33cd399d5304dd385a (diff) | |
| download | build-8914f71cc049e0fdeee9f0e10c1e74ba44db2876.zip build-8914f71cc049e0fdeee9f0e10c1e74ba44db2876.tar.gz build-8914f71cc049e0fdeee9f0e10c1e74ba44db2876.tar.bz2 | |
Remove logic for platform stlport gtest.
Now that the platforms stlport linked gtest is gone, we don't need the
logic for this any more. All platform tests will use libc++ (which has
been renamed to libgtest without a suffix).
Note that tests built with the NDK will still use stlport, but they
will use the NDK's stlport, not the platform's.
Bug: 15193147
Change-Id: Ifcb2489ed60c41e4ed028096b516c1ee643de907
Diffstat (limited to 'core/target_test_internal.mk')
| -rw-r--r-- | core/target_test_internal.mk | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/core/target_test_internal.mk b/core/target_test_internal.mk index ed011d1..f8a9f04 100644 --- a/core/target_test_internal.mk +++ b/core/target_test_internal.mk @@ -6,25 +6,10 @@ LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING LOCAL_C_INCLUDES += external/gtest/include -my_test_libcxx := true -ifdef LOCAL_SDK_VERSION -my_test_libcxx := false -endif -ifneq ($(filter $(strip $(LOCAL_CXX_STL)),stlport stlport_static),) -my_test_libcxx := false -endif - -ifeq ($(my_test_libcxx),true) -LOCAL_STATIC_LIBRARIES += libgtest_libc++ libgtest_main_libc++ -else -LOCAL_STATIC_LIBRARIES += libgtest libgtest_main - ifndef LOCAL_SDK_VERSION -LOCAL_C_INCLUDES += bionic \ - bionic/libstdc++/include \ - external/stlport/stlport -LOCAL_SHARED_LIBRARIES += libstlport libstdc++ -endif +LOCAL_STATIC_LIBRARIES += libgtest libgtest_main +else +LOCAL_STATIC_LIBRARIES += libgtest_ndk libgtest_main_ndk endif ifdef LOCAL_MODULE_PATH |