diff options
Diffstat (limited to 'core/target_test_internal.mk')
| -rw-r--r-- | core/target_test_internal.mk | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/core/target_test_internal.mk b/core/target_test_internal.mk index d84d3d9179..b5c3a7c34d 100644 --- a/core/target_test_internal.mk +++ b/core/target_test_internal.mk @@ -8,13 +8,9 @@ ifeq ($(LOCAL_GTEST),true) ifndef LOCAL_SDK_VERSION LOCAL_STATIC_LIBRARIES += libgtest_main libgtest else - ifneq (,$(filter c++_%,$(LOCAL_NDK_STL_VARIANT))) - my_ndk_gtest_suffix := _c++ - else ifneq ($(filter stlport_,$(LOCAL_NDK_STL_VARIANT)),) - my_ndk_gtest_suffix := _stlport - else # system STL, use stlport - my_ndk_gtest_suffix := _stlport - endif + # TODO(danalbert): Remove the suffix from the module since we only need the + # one variant now. + my_ndk_gtest_suffix := _c++ LOCAL_STATIC_LIBRARIES += \ libgtest_main_ndk$(my_ndk_gtest_suffix) \ libgtest_ndk$(my_ndk_gtest_suffix) |