diff options
| author | Elliott Hughes <enh@google.com> | 2014-07-10 10:39:07 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-07-10 10:39:07 -0700 |
| commit | fbe7ebf529b3d429ae9f153b7df3529554bfc64d (patch) | |
| tree | f193f84dde4110f5e610a275601207d8575a634c | |
| parent | 156acb18f53b32655abb34166ea737e4320ca366 (diff) | |
| download | android_frameworks_minikin-fbe7ebf529b3d429ae9f153b7df3529554bfc64d.tar.gz android_frameworks_minikin-fbe7ebf529b3d429ae9f153b7df3529554bfc64d.tar.bz2 android_frameworks_minikin-fbe7ebf529b3d429ae9f153b7df3529554bfc64d.zip | |
Switch minikin to the new icu.
Change-Id: I29a59edfe6102257c9f308aac1b4348ef7a18db7
| -rw-r--r-- | libs/minikin/Android.mk | 2 | ||||
| -rw-r--r-- | sample/Android.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/minikin/Android.mk b/libs/minikin/Android.mk index fd949c2..fde2cbb 100644 --- a/libs/minikin/Android.mk +++ b/libs/minikin/Android.mk @@ -35,7 +35,7 @@ LOCAL_MODULE := libminikin LOCAL_C_INCLUDES += \ external/harfbuzz_ng/src \ external/freetype/include \ - external/icu4c/common \ + external/icu/icu4c/source/common \ frameworks/minikin/include LOCAL_SHARED_LIBRARIES := \ diff --git a/sample/Android.mk b/sample/Android.mk index a19019a..ec06e38 100644 --- a/sample/Android.mk +++ b/sample/Android.mk @@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_C_INCLUDES += \ external/harfbuzz_ng/src \ external/freetype/include \ - external/icu4c/common \ + external/icu/icu4c/source/common \ frameworks/minikin/include LOCAL_SRC_FILES:= example.cpp @@ -52,7 +52,7 @@ LOCAL_MODULE_TAG := tests LOCAL_C_INCLUDES += \ external/harfbuzz_ng/src \ external/freetype/include \ - external/icu4c/common \ + external/icu/icu4c/source/common \ frameworks/minikin/include \ external/skia/src/core |