commit 6723e5241a45c6de224c96384a595a1bf5bc5449
author Elliott Hughes <enh@google.com> Wed Jul 09 23:59:37 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 09 14:45:53 2014 +0000
tree 264da8841394df8d97d608b1cffe1147733b87ac
parent fa7aae3642754610576328469c6afc68740cec5e
parent 85ca2725e854abb18e184edb3d72dae88c12d774

Merge "Switch sfntly to the new icu."

Android.mk

diff --git a/Android.mk b/Android.mk
index 9549a01..aa276fc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -133,8 +133,8 @@
 LOCAL_C_INCLUDES_Debug := \
 	$(LOCAL_PATH)/cpp/src \
 	$(LOCAL_PATH) \
-	external/icu4c/common \
-	external/icu4c/i18n \
+	external/icu/icu4c/source/common \
+	external/icu/icu4c/source/i18n \
 	frameworks/wilhelm/include \
 
 
@@ -216,8 +216,8 @@
 LOCAL_C_INCLUDES_Release := \
 	$(LOCAL_PATH)/cpp/src \
 	$(LOCAL_PATH) \
-	external/icu4c/common \
-	external/icu4c/i18n \
+	external/icu/icu4c/source/common \
+	external/icu/icu4c/source/i18n \
 	frameworks/wilhelm/include \
 
 
@@ -284,4 +284,4 @@
 
 include external/stlport/libstlport.mk
 
-include $(BUILD_STATIC_LIBRARY)
\ No newline at end of file
+include $(BUILD_STATIC_LIBRARY)