diff options
author | Dan Albert <danalbert@google.com> | 2014-12-02 13:27:04 -0800 |
---|---|---|
committer | Dan Albert <danalbert@google.com> | 2014-12-02 13:27:04 -0800 |
commit | 52c919b1835020ad3b1d3e51b33452f3a8e0c009 (patch) | |
tree | 7e29d24fc89a133bf4c04b0677320a0733de3e17 /Android.mk | |
parent | 1c7cf0400b5fd28491d2d670ac4482120542ce4b (diff) | |
download | cpp-52c919b1835020ad3b1d3e51b33452f3a8e0c009.tar.gz |
Don't hide C++ STL choice from the build system.
Change-Id: I46958a199e41f2705d38f4dd0009e0c99cbe0a00
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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) |