summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-12-02 23:46:27 (GMT)
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-12-02 23:46:28 (GMT)
commit36b381298a4efb7c293d394d8b1acbda68230989 (patch)
tree7e29d24fc89a133bf4c04b0677320a0733de3e17
parent1c7cf0400b5fd28491d2d670ac4482120542ce4b (diff)
parent52c919b1835020ad3b1d3e51b33452f3a8e0c009 (diff)
downloadandroid_abi_cpp-cm-13.0.zip
android_abi_cpp-cm-13.0.tar.gz
android_abi_cpp-cm-13.0.tar.bz2
-rw-r--r--Android.mk5
1 files 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)