commit 8df7653d5608e5d459758a91e6c677c7d5fcc43f
author Dan Albert <danalbert@google.com> Sat Nov 15 23:42:15 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Nov 15 23:42:15 2014 +0000
tree ef5026bef0a881aeea733ccbe4d566bfed539957
parent 5520d930c8e78a3bea4eeba9d0430d1c3f19dba8
parent 8914f71cc049e0fdeee9f0e10c1e74ba44db2876

Merge "Remove logic for platform stlport gtest."

core/target_test_internal.mk

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_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