diff options
| author | Dan Albert <danalbert@google.com> | 2014-05-21 18:12:33 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-05-29 09:25:18 -0700 |
| commit | 216ae149fcbb6a5ecef884ddc6cc817caab2bbfa (patch) | |
| tree | fbcda782b604529fa418f9b2291101027bab0864 | |
| parent | 6b2f23f11ecb2a3af71fa556206589f2cf413064 (diff) | |
| download | icu4c-216ae149fcbb6a5ecef884ddc6cc817caab2bbfa.tar.gz | |
Switch to libc++
Bug: 15193147
Change-Id: Ia51a4fdfdbae7377130a43c401c2d8d241671d1e
| -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) |