From 3a5aeba4bda8b0977678021deed7aebeaa63ded1 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 26 Sep 2014 15:37:52 -0700 Subject: Switch benchmarks and tests to libc++. Change-Id: I3b9c8f8c14a1e227e67ae1977cc29b0e8fccef5d --- benchmarks/Android.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'benchmarks') 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)) -- cgit v1.1