diff options
| author | Dan Albert <danalbert@google.com> | 2014-05-30 18:40:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-30 18:40:25 +0000 |
| commit | 73633790805606b00fcd3e1a03d06f0dfc0ec27c (patch) | |
| tree | 3e17ab17f821dac1f7a893693595434ee5fc0646 | |
| parent | e4bd30ae28bdb65c480411b345a41373ae899852 (diff) | |
| parent | a8b6e06ffdb59582cb3e8498b297b209f46ed33d (diff) | |
| download | icu4c-73633790805606b00fcd3e1a03d06f0dfc0ec27c.tar.gz | |
am a8b6e06f: Merge "Switch to libc++"
* commit 'a8b6e06ffdb59582cb3e8498b297b209f46ed33d':
Switch to libc++
| -rw-r--r-- | common/Android.mk | 5 | ||||
| -rw-r--r-- | i18n/Android.mk | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/common/Android.mk b/common/Android.mk index a9ebcdf7..a5d2688a 100644 --- a/common/Android.mk +++ b/common/Android.mk @@ -150,9 +150,8 @@ LOCAL_MODULE_TAGS := optional 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 344fd47f..195ce010 100644 --- a/i18n/Android.mk +++ b/i18n/Android.mk @@ -126,9 +126,8 @@ LOCAL_SHARED_LIBRARIES += libicuuc $(optional_android_logging_libraries) 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) |