diff options
| author | Dan Albert <danalbert@google.com> | 2014-12-02 23:46:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-02 23:46:28 +0000 |
| commit | 36b381298a4efb7c293d394d8b1acbda68230989 (patch) | |
| tree | 7e29d24fc89a133bf4c04b0677320a0733de3e17 | |
| parent | 1c7cf0400b5fd28491d2d670ac4482120542ce4b (diff) | |
| parent | 52c919b1835020ad3b1d3e51b33452f3a8e0c009 (diff) | |
| download | android_abi_cpp-36b381298a4efb7c293d394d8b1acbda68230989.tar.gz android_abi_cpp-36b381298a4efb7c293d394d8b1acbda68230989.tar.bz2 android_abi_cpp-36b381298a4efb7c293d394d8b1acbda68230989.zip | |
Merge "Don't hide C++ STL choice from the build system."HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001staging/cm-13.0+r22stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Ecm-13.0
| -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) |