commit 4d35da1df8b74c1965b2201f6089e7d7bb352def
author Dan Albert <danalbert@google.com> Mon May 19 10:50:15 2014 -0700
committer Dan Albert <danalbert@google.com> Mon May 19 11:33:14 2014 -0700
tree 21c58c7fa8fa2d34d777eeae25a79d5bf05b087a
parent 48ee47ce25fa9c99df49855ebf77ae1758d58d47

Removes bionic's dependence on stlport

Only affects tests/benchmarks. Confirmed passing on arm.

Change-Id: If158e23e8cd06e7597ef6f3c9376f6799b467e62

benchmarks/Android.mk

diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk
index cf3d692..d8e0d27 100644
--- a/benchmarks/Android.mk
+++ b/benchmarks/Android.mk
@@ -49,8 +49,7 @@
 LOCAL_MULTILIB := both
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_CFLAGS += $(benchmark_c_flags)
-LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include
-LOCAL_SHARED_LIBRARIES += libstlport
+include external/libcxx/libcxx.mk
 LOCAL_SRC_FILES := $(benchmark_src_files)
 include $(BUILD_EXECUTABLE)