From 8914f71cc049e0fdeee9f0e10c1e74ba44db2876 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Tue, 11 Nov 2014 16:19:59 -0800 Subject: [PATCH] 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 --- core/target_test_internal.mk | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/core/target_test_internal.mk b/core/target_test_internal.mk index ed011d11b4..f8a9f049fa 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