diff options
| author | Neil Fuller <nfuller@google.com> | 2015-06-01 17:07:27 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2015-06-03 16:05:36 +0100 |
| commit | e6b250997886dbbcd02fa520d1d8b61e56aac405 (patch) | |
| tree | a45a7ad0969bf6999402e177c76f1d0cee0c5019 /icu4c | |
| parent | 59dfc3cc05378055038fe98bce6f6740e5a120de (diff) | |
| download | android_external_icu-e6b250997886dbbcd02fa520d1d8b61e56aac405.tar.gz android_external_icu-e6b250997886dbbcd02fa520d1d8b61e56aac405.tar.bz2 android_external_icu-e6b250997886dbbcd02fa520d1d8b61e56aac405.zip | |
Remove build-time configuration for ICU4C.
The presence of this configuration causes Android to
map the file one more time than necessary.
Bug: 19961406
Bug: 19960867
(cherry-picked from commit 2b29e461ceca7c72feebf97a1807d8eb2694a94a)
Change-Id: Iea65e2a699c06746cedbd1416ef7bfdcaf8dc8b5
Diffstat (limited to 'icu4c')
| -rw-r--r-- | icu4c/source/common/Android.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/icu4c/source/common/Android.mk b/icu4c/source/common/Android.mk index c82ac3fb2..d3f55e919 100644 --- a/icu4c/source/common/Android.mk +++ b/icu4c/source/common/Android.mk @@ -126,11 +126,8 @@ c_includes := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/../i18n -# We make the ICU data directory relative to $ANDROID_ROOT on Android, so both -# device and sim builds can use the same codepath, and it's hard to break one -# without noticing because the other still works. -local_cflags := '-DICU_DATA_DIR_PREFIX_ENV_VAR="ANDROID_ROOT"' -local_cflags += '-DICU_DATA_DIR="/usr/icu"' +# We deliberately do not set -DICU_DATA_DIR: ICU4C is configured on Android +# using udata_setCommonData. local_cflags += -D_REENTRANT local_cflags += -DU_COMMON_IMPLEMENTATION |