commit 12fecf7f8096149650828621eab0372f874e72c9
author Elliott Hughes <enh@google.com> Wed Jul 09 16:04:29 2014 -0700
committer Elliott Hughes <enh@google.com> Wed Jul 09 16:04:29 2014 -0700
tree d19b3589f0cdce556ccb23ca539637f696e40f50
parent ba9ec441bf16e801106029292e6e51a7909373b6

Switch libxml2 to the new icu.

Change-Id: Ifa65cffa652769a739c3b79bc317e6eb5ab753ff

Android.mk

diff --git a/Android.mk b/Android.mk
index aa54aee..b189c97 100644
--- a/Android.mk
+++ b/Android.mk
@@ -49,7 +49,8 @@
 	schematron.c
 
 common_C_INCLUDES += \
-	$(LOCAL_PATH)/include
+	$(LOCAL_PATH)/include \
+	external/icu/icu4c/source/common \
 
 # Turn off warnings to prevent log message spam
 # These warnings are not disabled because they are not supported by gcc 4.2.1
@@ -68,7 +69,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(common_SRC_FILES)
-LOCAL_C_INCLUDES += $(common_C_INCLUDES) external/icu4c/common
+LOCAL_C_INCLUDES += $(common_C_INCLUDES)
 LOCAL_SHARED_LIBRARIES += $(common_SHARED_LIBRARIES)
 LOCAL_CFLAGS += -fvisibility=hidden
 LOCAL_CFLAGS += $(DISABLED_WARNING_FLAGS)
@@ -83,7 +84,7 @@
 
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(common_SRC_FILES)
-LOCAL_C_INCLUDES += $(common_C_INCLUDES) external/icu4c/common
+LOCAL_C_INCLUDES += $(common_C_INCLUDES)
 LOCAL_CFLAGS += $(DISABLED_WARNING_FLAGS)
 LOCAL_SHARED_LIBRARIES += $(common_SHARED_LIBRARIES)
 LOCAL_MODULE:= libxml2