commit 683c392e07a555aa1d6eece1eb6d5aef04ab1943
author Dan Albert <danalbert@google.com> Fri Sep 26 15:45:33 2014 -0700
committer Dan Albert <danalbert@google.com> Fri Sep 26 15:45:33 2014 -0700
tree 1d5423e8be5b99a5b28746d7fb81aa4ced02bf6b
parent 670018fdaed33a6872925e60fd95c5f401e45444

Fix detection of C++ STL for tests.

Target tests weren't approrpiately using the libc++ gtest for
libc++_static, and the hosts tests were still using the old check.

Change-Id: I13813d5f09673b144b2dfead93eb81cb4bae0e34

core/target_test_internal.mk

diff --git a/core/target_test_internal.mk b/core/target_test_internal.mk
index 65def9c..50f4036 100644
--- a/core/target_test_internal.mk
+++ b/core/target_test_internal.mk
@@ -9,7 +9,7 @@
 my_test_libcxx := false
 ifndef LOCAL_SDK_VERSION
 ifeq (,$(TARGET_BUILD_APPS))
-ifeq ($(strip $(LOCAL_CXX_STL)),libc++)
+ifneq ($(filter $(strip $(LOCAL_CXX_STL)),libc++ libc++_static),)
 my_test_libcxx := true
 endif
 endif