* commit '71b0d7b25065b2be35248380c3b98b0f77d27bd6': Remove logic for platform stlport gtest.
This commit is contained in:
@@ -6,25 +6,10 @@ LOCAL_CFLAGS += -DGTEST_OS_LINUX_ANDROID -DGTEST_HAS_STD_STRING
|
|||||||
|
|
||||||
LOCAL_C_INCLUDES += external/gtest/include
|
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
|
ifndef LOCAL_SDK_VERSION
|
||||||
LOCAL_C_INCLUDES += bionic \
|
LOCAL_STATIC_LIBRARIES += libgtest libgtest_main
|
||||||
bionic/libstdc++/include \
|
else
|
||||||
external/stlport/stlport
|
LOCAL_STATIC_LIBRARIES += libgtest_ndk libgtest_main_ndk
|
||||||
LOCAL_SHARED_LIBRARIES += libstlport libstdc++
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef LOCAL_MODULE_PATH
|
ifdef LOCAL_MODULE_PATH
|
||||||
|
Reference in New Issue
Block a user