diff options
| author | 2014-07-09 17:40:24 -0700 | |
|---|---|---|
| committer | 2014-07-09 17:40:24 -0700 | |
| commit | b58d385e17f3b71705f23fe77aa8c12147ec9ea5 (patch) | |
| tree | a99a16474c02c9c8f25cf48d387a45bada8144a4 | |
| parent | 051a3204d47d848dbe275c0db0acc3f7f7d12b55 (diff) | |
| parent | f6be5a7ac8c3891d79dd836ac5cfdc0588859494 (diff) | |
resolved conflicts for merge of f6be5a7a to master
Change-Id: I6dcfb33981df90877fb9f3752b853cf377633edf
| -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 38a7fa5604e2..869a91b03a52 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -179,6 +179,7 @@ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/av/include \ $(TOP)/system/media/camera/include \ $(TOP)/system/netd/include \ + external/icu/icu4c/source/common \ external/pdfium/core/include/fpdfapi \ external/pdfium/core/include/fpdfdoc \ external/pdfium/fpdfsdk/include \ @@ -190,8 +191,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 \ |