Make the libc++ libraries the primary.
The stlport linked libraries are compiled with the NDK, so do not need
to be removed. They are being renamed to libstlport_ndk to make their
intended use explicit, and should not be used for platform tests.
Bug: 15193147
Change-Id: I871e765ae1cd006971542f3926509b85f7edb7e7
diff --git a/src/Android.mk b/src/Android.mk
index 19799a6..f4e18cf 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -52,7 +52,7 @@
LOCAL_SRC_FILES := gtest-all.cc
LOCAL_C_INCLUDES := $(libgtest_target_includes)
LOCAL_CFLAGS += $(libgtest_cflags)
-LOCAL_MODULE := libgtest
+LOCAL_MODULE := libgtest_ndk
include $(BUILD_STATIC_LIBRARY)
@@ -69,7 +69,7 @@
LOCAL_SRC_FILES := gtest_main.cc
LOCAL_C_INCLUDES := $(libgtest_target_includes)
LOCAL_CFLAGS += $(libgtest_cflags)
-LOCAL_MODULE := libgtest_main
+LOCAL_MODULE := libgtest_main_ndk
include $(BUILD_STATIC_LIBRARY)
@@ -123,7 +123,7 @@
LOCAL_SRC_FILES := gtest-all.cc
LOCAL_C_INCLUDES := $(libgtest_target_includes)
LOCAL_CFLAGS += $(libgtest_cflags)
-LOCAL_MODULE := libgtest_libc++
+LOCAL_MODULE := libgtest
LOCAL_ADDRESS_SANITIZER := false
include $(BUILD_STATIC_LIBRARY)
@@ -139,7 +139,7 @@
LOCAL_SRC_FILES := gtest_main.cc
LOCAL_C_INCLUDES := $(libgtest_target_includes)
LOCAL_CFLAGS += $(libgtest_cflags)
-LOCAL_MODULE := libgtest_main_libc++
+LOCAL_MODULE := libgtest_main
LOCAL_ADDRESS_SANITIZER := false
include $(BUILD_STATIC_LIBRARY)
diff --git a/test/Android.mk b/test/Android.mk
index b89082a..780be3c 100644
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -30,12 +30,10 @@
libgtest_test_includes := $(libgtest_test_common_includes)
libgtest_test_static_lib := libgtest_main libgtest
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_ldflags := -lpthread
-libgtest_test_host_cxx_stl := libc++
# $(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
@@ -60,7 +58,6 @@
$(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)) \
