summaryrefslogtreecommitdiffstats
path: root/benchmarks
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-09-26 15:37:52 -0700
committerDan Albert <danalbert@google.com>2014-09-30 10:28:30 -0700
commit3a5aeba4bda8b0977678021deed7aebeaa63ded1 (patch)
tree631f9ac4e13ff3f71c2421b1ff92bc0dd3525990 /benchmarks
parentd9898c5b8292b9eecc40a7819bfedb4e1a4fe041 (diff)
downloadbionic-3a5aeba4bda8b0977678021deed7aebeaa63ded1.zip
bionic-3a5aeba4bda8b0977678021deed7aebeaa63ded1.tar.gz
bionic-3a5aeba4bda8b0977678021deed7aebeaa63ded1.tar.bz2
Switch benchmarks and tests to libc++.
Change-Id: I3b9c8f8c14a1e227e67ae1977cc29b0e8fccef5d
Diffstat (limited to 'benchmarks')
-rw-r--r--benchmarks/Android.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk
index 4d7ad96..00250a5 100644
--- a/benchmarks/Android.mk
+++ b/benchmarks/Android.mk
@@ -49,9 +49,8 @@ LOCAL_MODULE_STEM_64 := bionic-benchmarks64
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
LOCAL_SRC_FILES := $(benchmark_src_files)
+LOCAL_CXX_STL := libc++
include $(BUILD_EXECUTABLE)
ifeq ($(HOST_OS)-$(HOST_ARCH),$(filter $(HOST_OS)-$(HOST_ARCH),linux-x86 linux-x86_64))