commit 3a5aeba4bda8b0977678021deed7aebeaa63ded1
author Dan Albert <danalbert@google.com> Fri Sep 26 15:37:52 2014 -0700
committer Dan Albert <danalbert@google.com> Tue Sep 30 10:28:30 2014 -0700
tree 631f9ac4e13ff3f71c2421b1ff92bc0dd3525990
parent d9898c5b8292b9eecc40a7819bfedb4e1a4fe041

Switch benchmarks and tests to libc++.

Change-Id: I3b9c8f8c14a1e227e67ae1977cc29b0e8fccef5d

tests/Android.build.mk

diff --git a/tests/Android.build.mk b/tests/Android.build.mk
index d54c851..9562287 100644
--- a/tests/Android.build.mk
+++ b/tests/Android.build.mk
@@ -15,6 +15,7 @@
 #
 
 include $(CLEAR_VARS)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 LOCAL_MODULE := $(module)
 LOCAL_MODULE_TAGS := $(module_tag)
@@ -85,9 +86,13 @@
     $($(module)_ldlibs) \
     $($(module)_ldlibs_$(build_type)) \
 
-ifeq ($(build_type),target)
-  include external/stlport/libstlport.mk
+ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
+LOCAL_CXX_STL := libc++_static
+else
+LOCAL_CXX_STL := libc++
+endif
 
+ifeq ($(build_type),target)
   include $(BUILD_$(build_target))
 endif