Switch to libc++
Bug: 15193147
Change-Id: Ia51a4fdfdbae7377130a43c401c2d8d241671d1e
diff --git a/common/Android.mk b/common/Android.mk
index a9ebcdf..a5d2688 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -150,9 +150,8 @@
LOCAL_MODULE := libicuuc
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
LOCAL_REQUIRED_MODULES += icu-data
-# Use "-include" to not fail apps_only build.
--include abi/cpp/use_rtti.mk
--include external/stlport/libstlport.mk
+LOCAL_RTTI_FLAG := -frtti
+include external/libcxx/libcxx.mk
include $(BUILD_SHARED_LIBRARY)
#
diff --git a/i18n/Android.mk b/i18n/Android.mk
index 344fd47..195ce01 100644
--- a/i18n/Android.mk
+++ b/i18n/Android.mk
@@ -126,9 +126,8 @@
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libicui18n
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
-# Use "-include" to not fail apps_only build.
--include abi/cpp/use_rtti.mk
--include external/stlport/libstlport.mk
+LOCAL_RTTI_FLAG := -frtti
+include external/libcxx/libcxx.mk
include $(BUILD_SHARED_LIBRARY)
