Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb5f4177 authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Remove logic for libstdc++ gtest libs."

parents 652ff716 ea93ae61
Loading
Loading
Loading
Loading
+0 −13
Original line number Diff line number Diff line
@@ -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