Loading core/target_test_internal.mk +3 −3 Original line number Diff line number Diff line Loading @@ -8,13 +8,13 @@ ifndef LOCAL_SDK_VERSION LOCAL_STATIC_LIBRARIES += libgtest_main libgtest else ifneq (,$(filter c++_%,$(LOCAL_NDK_STL_VARIANT))) my_ndk_gtest_suffix := _libcxx my_ndk_gtest_suffix := _c++ else ifneq ($(filter stlport_,$(LOCAL_NDK_STL_VARIANT)),) my_ndk_gtest_suffix := my_ndk_gtest_suffix := _stlport else ifneq ($(filter gnustl_,$(LOCAL_NDK_STL_VARIANT)),) my_ndk_gtest_suffix := _gnustl else # system STL, use stlport my_ndk_gtest_suffix := my_ndk_gtest_suffix := _stlport endif LOCAL_STATIC_LIBRARIES += \ libgtest_main_ndk$(my_ndk_gtest_suffix) \ Loading Loading
core/target_test_internal.mk +3 −3 Original line number Diff line number Diff line Loading @@ -8,13 +8,13 @@ ifndef LOCAL_SDK_VERSION LOCAL_STATIC_LIBRARIES += libgtest_main libgtest else ifneq (,$(filter c++_%,$(LOCAL_NDK_STL_VARIANT))) my_ndk_gtest_suffix := _libcxx my_ndk_gtest_suffix := _c++ else ifneq ($(filter stlport_,$(LOCAL_NDK_STL_VARIANT)),) my_ndk_gtest_suffix := my_ndk_gtest_suffix := _stlport else ifneq ($(filter gnustl_,$(LOCAL_NDK_STL_VARIANT)),) my_ndk_gtest_suffix := _gnustl else # system STL, use stlport my_ndk_gtest_suffix := my_ndk_gtest_suffix := _stlport endif LOCAL_STATIC_LIBRARIES += \ libgtest_main_ndk$(my_ndk_gtest_suffix) \ Loading