diff options
| author | Elliott Hughes <enh@google.com> | 2014-07-09 23:59:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-09 22:27:32 +0000 |
| commit | effcc83e42638a5fa7eceaebe22081a1b9eaebaf (patch) | |
| tree | ef148e4263c3fd8878d60d3eeb4107561a26ef87 | |
| parent | 74803e559caffe235b86dc52cf76ef98343c0d74 (diff) | |
| parent | 92b1896dfd42079c264e68f819273ba71f177fea (diff) | |
| download | frameworks_base-effcc83e42638a5fa7eceaebe22081a1b9eaebaf.zip frameworks_base-effcc83e42638a5fa7eceaebe22081a1b9eaebaf.tar.gz frameworks_base-effcc83e42638a5fa7eceaebe22081a1b9eaebaf.tar.bz2 | |
Merge "Switch frameworks/base/core/jni to the new icu."
| -rw-r--r-- | core/jni/Android.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index bdef428..8894c18 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -162,6 +162,7 @@ LOCAL_C_INCLUDES += \ $(call include-path-for, libhardware_legacy)/hardware_legacy \ $(TOP)/frameworks/av/include \ $(TOP)/system/media/camera/include \ + external/icu/icu4c/source/common \ external/skia/src/core \ external/skia/src/pdf \ external/skia/src/images \ @@ -171,8 +172,6 @@ LOCAL_C_INCLUDES += \ external/expat/lib \ external/openssl/include \ external/tremor/Tremor \ - external/icu4c/i18n \ - external/icu4c/common \ external/jpeg \ external/harfbuzz_ng/src \ external/zlib \ |