summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-01-05 11:44:09 +0000
committerNarayan Kamath <narayan@google.com>2015-01-05 11:44:09 +0000
commit5870d4f0d46f185568a2d2ea45afe48ae999b223 (patch)
treeb740a19454ce6d0b29e892a5757a607359373d5c
parentcb20a2f0b366bfc16db3a489a60156dec7a9fe21 (diff)
downloadandroid_frameworks_minikin-5870d4f0d46f185568a2d2ea45afe48ae999b223.tar.gz
android_frameworks_minikin-5870d4f0d46f185568a2d2ea45afe48ae999b223.tar.bz2
android_frameworks_minikin-5870d4f0d46f185568a2d2ea45afe48ae999b223.zip
Remove hardcoded ICU include paths.
ICU exports them using LOCAL_EXPORT_C_INCLUDE_DIRS. bug: 18581021 Change-Id: Ia57b3b4d231966203274b0e7e7b850beb1bd11c0
-rw-r--r--libs/minikin/Android.mk1
-rw-r--r--sample/Android.mk2
2 files changed, 0 insertions, 3 deletions
diff --git a/libs/minikin/Android.mk b/libs/minikin/Android.mk
index 60a46ef..d9c973d 100644
--- a/libs/minikin/Android.mk
+++ b/libs/minikin/Android.mk
@@ -33,7 +33,6 @@ LOCAL_MODULE := libminikin
LOCAL_C_INCLUDES += \
external/harfbuzz_ng/src \
external/freetype/include \
- external/icu/icu4c/source/common \
frameworks/minikin/include
LOCAL_SHARED_LIBRARIES := \
diff --git a/sample/Android.mk b/sample/Android.mk
index 101a413..c4a644d 100644
--- a/sample/Android.mk
+++ b/sample/Android.mk
@@ -21,7 +21,6 @@ LOCAL_MODULE_TAGS := tests
LOCAL_C_INCLUDES += \
external/harfbuzz_ng/src \
external/freetype/include \
- external/icu/icu4c/source/common \
frameworks/minikin/include
LOCAL_SRC_FILES:= example.cpp
@@ -49,7 +48,6 @@ LOCAL_MODULE_TAG := tests
LOCAL_C_INCLUDES += \
external/harfbuzz_ng/src \
external/freetype/include \
- external/icu/icu4c/source/common \
frameworks/minikin/include \
external/skia/src/core