From 52c919b1835020ad3b1d3e51b33452f3a8e0c009 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Tue, 2 Dec 2014 13:27:04 -0800 Subject: Don't hide C++ STL choice from the build system. Change-Id: I46958a199e41f2705d38f4dd0009e0c99cbe0a00 --- Android.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Android.mk b/Android.mk index 447a8d8..8e01831 100644 --- a/Android.mk +++ b/Android.mk @@ -2,7 +2,6 @@ LOCAL_PATH:= $(call my-dir) libgabi++_c_includes := \ $(LOCAL_PATH)/include \ - bionic/libstdc++/include \ libgabi++_common_src_files := \ src/array_type_info.cc \ @@ -27,7 +26,7 @@ LOCAL_SRC_FILES:= $(libgabi++_common_src_files) LOCAL_MODULE:= libgabi++ LOCAL_C_INCLUDES := $(libgabi++_c_includes) LOCAL_RTTI_FLAG := -frtti -LOCAL_SYSTEM_SHARED_LIBRARIES := libc +LOCAL_CXX_STL := libstdc++ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -38,5 +37,5 @@ LOCAL_SRC_FILES:= $(libgabi++_common_src_files) LOCAL_MODULE:= libgabi++ LOCAL_C_INCLUDES := $(libgabi++_c_includes) LOCAL_RTTI_FLAG := -frtti -LOCAL_SYSTEM_SHARED_LIBRARIES := libc +LOCAL_CXX_STL := libstdc++ include $(BUILD_STATIC_LIBRARY) -- cgit v1.2.3