commit c74d5ba601aafaa6ce59a6a55a77656f069389f9
author Elliott Hughes <enh@google.com> Thu Jul 10 00:49:48 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 10 00:49:48 2014 +0000
tree 472b69058847e3d2cb4ff6a07e6317dd652a26a4
parent 41d05f2f7fc0273b678751abc3553a1bcb999352
parent 399e808f940777d18efe377bd34f738dc84729e0

am 399e808f: Merge "Switch libxml2 to the new icu."

* commit '399e808f940777d18efe377bd34f738dc84729e0':
  Switch libxml2 to the new icu.

Android.mk

diff --git a/Android.mk b/Android.mk
index d30ef43..883f898 100644
--- a/Android.mk
+++ b/Android.mk
@@ -50,7 +50,8 @@
 	buf.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
@@ -69,7 +70,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)
@@ -91,7 +92,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