diff options
| author | Dan Albert <danalbert@google.com> | 2014-05-30 20:18:08 +0000 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-05-30 20:18:08 +0000 |
| commit | a272244298c6aa755397ed986a79d79bc4de9bc3 (patch) | |
| tree | 45e587e11e2fb53fb056972a0311fed07e96f527 | |
| parent | 216ae149fcbb6a5ecef884ddc6cc817caab2bbfa (diff) | |
| download | icu4c-a272244298c6aa755397ed986a79d79bc4de9bc3.tar.gz | |
Revert "Switch to libc++"
This reverts commit 216ae149fcbb6a5ecef884ddc6cc817caab2bbfa.
Change-Id: Iffeb23fc1aeca5ac2ca4cf2f9273e0bfcb46c1c9
| -rw-r--r-- | common/Android.mk | 5 | ||||
| -rw-r--r-- | i18n/Android.mk | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/common/Android.mk b/common/Android.mk index a5d2688a..a9ebcdf7 100644 --- a/common/Android.mk +++ b/common/Android.mk @@ -150,8 +150,9 @@ LOCAL_MODULE_TAGS := optional 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) # diff --git a/i18n/Android.mk b/i18n/Android.mk index 195ce010..344fd47f 100644 --- a/i18n/Android.mk +++ b/i18n/Android.mk @@ -126,8 +126,9 @@ LOCAL_SHARED_LIBRARIES += libicuuc $(optional_android_logging_libraries) 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) |