commit 36b381298a4efb7c293d394d8b1acbda68230989
author Dan Albert <danalbert@google.com> Tue Dec 02 23:46:27 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 02 23:46:28 2014 +0000
tree 7e29d24fc89a133bf4c04b0677320a0733de3e17
parent 1c7cf0400b5fd28491d2d670ac4482120542ce4b
parent 52c919b1835020ad3b1d3e51b33452f3a8e0c009

Merge "Don't hide C++ STL choice from the build system."

Android.mk

diff --git a/Android.mk b/Android.mk
index 447a8d8..8e01831 100644
--- a/Android.mk
+++ b/Android.mk
@@ -2,7 +2,6 @@
 
 libgabi++_c_includes := \
 	$(LOCAL_PATH)/include \
-	bionic/libstdc++/include \
 
 libgabi++_common_src_files := \
 	src/array_type_info.cc \
@@ -27,7 +26,7 @@
 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_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)