summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-01-05 16:38:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-05 16:38:00 +0000
commit30c70ff7142e9cf3cd795a7afdf2b5afe8bc4564 (patch)
tree7c121923bfde09bdf0b0318b2d8170d7d1d0fb96
parentda09490825ce49e103d511ec1b92c79df0923ada (diff)
parent79298c346088e13a0ddc93d49f4bb100afdbd14b (diff)
downloadandroid_frameworks_minikin-30c70ff7142e9cf3cd795a7afdf2b5afe8bc4564.tar.gz
android_frameworks_minikin-30c70ff7142e9cf3cd795a7afdf2b5afe8bc4564.tar.bz2
android_frameworks_minikin-30c70ff7142e9cf3cd795a7afdf2b5afe8bc4564.zip
am 79298c34: am 5870d4f0: Remove hardcoded ICU include paths.
* commit '79298c346088e13a0ddc93d49f4bb100afdbd14b': Remove hardcoded ICU include paths.
-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