drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f072fda1: am effcc83e: Merge "Switch frameworks/base/core/jni to the new icu."

Browse Source 
* commit 'f072fda13fd47d7dc7246cb821a26990d8fb271f':
  Switch frameworks/base/core/jni to the new icu.
This commit is contained in:
Elliott Hughes
2014-07-10 00:16:29 +00:00
committed by Android Git Automerger
parent 10c286d657 f072fda13f
commit f6be5a7ac8
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/jni/Android.mk
View File

@ -162,6 +162,7 @@ LOCAL_C_INCLUDES += \
$(call include-path-for, libhardware_legacy)/hardware_legacy \ $(call include-path-for, libhardware_legacy)/hardware_legacy \
$(TOP)/frameworks/av/include \ $(TOP)/frameworks/av/include \
$(TOP)/system/media/camera/include \ $(TOP)/system/media/camera/include \
external/icu/icu4c/source/common \
external/skia/src/core \ external/skia/src/core \
external/skia/src/pdf \ external/skia/src/pdf \
external/skia/src/images \ external/skia/src/images \
@ -171,8 +172,6 @@ LOCAL_C_INCLUDES += \
external/expat/lib \ external/expat/lib \
external/openssl/include \ external/openssl/include \
external/tremor/Tremor \ external/tremor/Tremor \
external/icu4c/i18n \
external/icu4c/common \
external/jpeg \ external/jpeg \
external/harfbuzz_ng/src \ external/harfbuzz_ng/src \
external/zlib \ external/zlib \