Merge "Remove hardcoded ICU include paths."
diff --git a/Android.mk b/Android.mk
index 8b5d945..682700c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -45,10 +45,7 @@
xmlwriter.c legacy.c chvalid.c pattern.c xmlsave.c xmlmodule.c \
schematron.c
-common_C_INCLUDES += \
- $(LOCAL_PATH)/include \
- external/icu/icu4c/source/common \
- external/zlib \
+common_C_INCLUDES += $(LOCAL_PATH)/include
common_CFLAGS += -fvisibility=hidden
@@ -64,7 +61,7 @@
LOCAL_SRC_FILES := $(common_SRC_FILES)
LOCAL_C_INCLUDES += $(common_C_INCLUDES)
LOCAL_CFLAGS += $(common_CFLAGS)
-LOCAL_SHARED_LIBRARIES += $(common_SHARED_LIBRARIES)
+LOCAL_SHARED_LIBRARIES += libicuuc
LOCAL_MODULE := libxml2
LOCAL_CLANG := true
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
@@ -74,7 +71,7 @@
LOCAL_SRC_FILES := $(common_SRC_FILES)
LOCAL_C_INCLUDES += $(common_C_INCLUDES)
LOCAL_CFLAGS += $(common_CFLAGS)
-LOCAL_SHARED_LIBRARIES += $(common_SHARED_LIBRARIES)
+LOCAL_SHARED_LIBRARIES += libicuuc-host
LOCAL_MODULE := libxml2
LOCAL_CLANG := true
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
diff --git a/CleanSpec.mk b/CleanSpec.mk
index b84e1b6..0f8393f 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -44,6 +44,9 @@
#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libxml2_intermediates)
+$(call add-clean-step, rm -rf $(HOST_OUT)/obj/STATIC_LIBRARIES/libxml2_intermediates)
+
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
