commit 6a29d748029fd83f526f695cccdf00afed570231
author Dan Albert <danalbert@google.com> Fri May 30 20:20:54 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 30 20:20:54 2014 +0000
tree 2587ada77e7ea9621f05df982b93052e6d30dfc0
parent 73633790805606b00fcd3e1a03d06f0dfc0ec27c
parent e7af79d89d5c5d3dd7753e9421e11ea6fe7cb19f

am e7af79d8: Merge "Revert "Switch to libc++""

* commit 'e7af79d89d5c5d3dd7753e9421e11ea6fe7cb19f':
  Revert "Switch to libc++"

common/Android.mk

diff --git a/common/Android.mk b/common/Android.mk
index a5d2688..a9ebcdf 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -150,8 +150,9 @@
 LOCAL_MODULE := libicuuc
 LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
 LOCAL_REQUIRED_MODULES += icu-data
-LOCAL_RTTI_FLAG := -frtti
-include external/libcxx/libcxx.mk
+# Use "-include" to not fail apps_only build.
+-include abi/cpp/use_rtti.mk
+-include external/stlport/libstlport.mk
 include $(BUILD_SHARED_LIBRARY)
 
 #

i18n/Android.mk

diff --git a/i18n/Android.mk b/i18n/Android.mk
index 195ce01..344fd47 100644
--- a/i18n/Android.mk
+++ b/i18n/Android.mk
@@ -126,8 +126,9 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libicui18n
 LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
-LOCAL_RTTI_FLAG := -frtti
-include external/libcxx/libcxx.mk
+# Use "-include" to not fail apps_only build.
+-include abi/cpp/use_rtti.mk
+-include external/stlport/libstlport.mk
 include $(BUILD_SHARED_LIBRARY)