diff options
| author | Elliott Hughes <enh@google.com> | 2014-07-10 00:16:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-10 00:16:29 +0000 |
| commit | f6be5a7ac8c3891d79dd836ac5cfdc0588859494 (patch) | |
| tree | f293380f5549f5882bf50db3d1b521fe1edb5204 | |
| parent | 10c286d657c93c8b80b8d336661569256749f39e (diff) | |
| parent | f072fda13fd47d7dc7246cb821a26990d8fb271f (diff) | |
| download | frameworks_base-f6be5a7ac8c3891d79dd836ac5cfdc0588859494.zip frameworks_base-f6be5a7ac8c3891d79dd836ac5cfdc0588859494.tar.gz frameworks_base-f6be5a7ac8c3891d79dd836ac5cfdc0588859494.tar.bz2 | |
am f072fda1: am effcc83e: Merge "Switch frameworks/base/core/jni to the new icu."
* commit 'f072fda13fd47d7dc7246cb821a26990d8fb271f':
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 \ |