commit 7a39094465bbd01a22565fce1f1155c762f8d145
author Dan Albert <danalbert@google.com> Mon May 19 23:46:51 2014 +0000
committer Dan Albert <danalbert@google.com> Mon May 19 23:46:51 2014 +0000
tree c3d23c62894a3dbabd5d0160166afe7ab5f4fcf3
parent 4d35da1df8b74c1965b2201f6089e7d7bb352def

Revert "Removes bionic's dependence on stlport"

This reverts commit 4d35da1df8b74c1965b2201f6089e7d7bb352def.

Change-Id: Ie9a2620441edb55dbc5949e13a4b913ea4e66797

benchmarks/Android.mk

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