commit 56c2a18a50c0dc1eccb824195ce4ef75c2993e00
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 12 20:48:42 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 12 20:48:42 2016 +0000
tree 2dd3d949032e21ff1a68900596584c29fe59587a
parent f9d5fb97cb51d5f550757d971485dde4a3d88b03
parent f5d024d31a88997b1c60e1e66dc2dacde364f09f

Merge "Update NDK gtest lib names."

core/target_test_internal.mk

diff --git a/core/target_test_internal.mk b/core/target_test_internal.mk
index 1a22510..2e65218 100644
--- a/core/target_test_internal.mk
+++ b/core/target_test_internal.mk
@@ -8,13 +8,13 @@
     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) \