Remove logic for libstdc++ gtest libs.

The libstdc++ linked gtest libraries are no longer necessary.

Change-Id: Ia98263bc2541b6c8fd0b3e22bb6fec85104a2210
This commit is contained in:
Dan Albert
2014-11-09 00:55:25 -08:00
parent 652ff716b8
commit ea93ae61e3

View File

@@ -12,17 +12,4 @@ endif
LOCAL_CFLAGS += -DGTEST_HAS_STD_STRING -O0 -g
LOCAL_C_INCLUDES += external/gtest/include
my_test_libcxx := true
ifeq (,$(TARGET_BUILD_APPS))
ifneq ($(filter $(strip $(LOCAL_CXX_STL)),bionic stlport stlport_static),)
my_test_libcxx := false
endif
endif
ifeq ($(my_test_libcxx),true)
LOCAL_STATIC_LIBRARIES += libgtest_libc++_host libgtest_main_libc++_host
else
LOCAL_STATIC_LIBRARIES += libgtest_host libgtest_main_host
LOCAL_SHARED_LIBRARIES +=
endif