diff options
author | Elliott Hughes <enh@google.com> | 2014-07-10 00:16:46 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-10 00:16:46 +0000 |
commit | 82efa5dddfdb3318b2c9bbf47471001607afb5e1 (patch) | |
tree | 798172116111b8bff0ea229c851bc848719e6ecc /luni | |
parent | 43a4131deff5568be206b307644b8ed9944587e8 (diff) | |
parent | dde7a735325e7d7fe1e5c71ead206673efd18e54 (diff) | |
download | libcore-82efa5dddfdb3318b2c9bbf47471001607afb5e1.zip libcore-82efa5dddfdb3318b2c9bbf47471001607afb5e1.tar.gz libcore-82efa5dddfdb3318b2c9bbf47471001607afb5e1.tar.bz2 |
am dde7a735: Merge "Switch libcore to the new icu."
* commit 'dde7a735325e7d7fe1e5c71ead206673efd18e54':
Switch libcore to the new icu.
Diffstat (limited to 'luni')
-rw-r--r-- | luni/src/main/native/sub.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/luni/src/main/native/sub.mk b/luni/src/main/native/sub.mk index 88085c6..5b581f3 100644 --- a/luni/src/main/native/sub.mk +++ b/luni/src/main/native/sub.mk @@ -57,8 +57,8 @@ LOCAL_SRC_FILES := \ valueOf.cpp \ LOCAL_C_INCLUDES += \ - external/icu4c/common \ - external/icu4c/i18n \ + external/icu/icu4c/source/common \ + external/icu/icu4c/source/i18n \ external/openssl/include \ external/zlib \ system/core/include \ |