diff options
| author | Narayan Kamath <narayan@google.com> | 2014-12-31 09:59:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-31 09:59:01 +0000 |
| commit | ae6a8d8614ae0f8b91ea2143371eedd19878895a (patch) | |
| tree | e36b970f77aed21df68512acd8fbd85620ab3d37 | |
| parent | 092a4128310076d918a20d09d48e6b86a8cd38b0 (diff) | |
| parent | 4ea9a234819e89cdd2865946beacecc396462616 (diff) | |
| download | android_external_libxml2-ae6a8d8614ae0f8b91ea2143371eedd19878895a.tar.gz android_external_libxml2-ae6a8d8614ae0f8b91ea2143371eedd19878895a.tar.bz2 android_external_libxml2-ae6a8d8614ae0f8b91ea2143371eedd19878895a.zip | |
Merge "Remove hardcoded ICU include paths."
| -rw-r--r-- | Android.mk | 9 | ||||
| -rw-r--r-- | CleanSpec.mk | 3 |
2 files changed, 6 insertions, 6 deletions
@@ -45,10 +45,7 @@ common_SRC_FILES := SAX.c entities.c encoding.c error.c \ 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 @@ include $(CLEAR_VARS) 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 @@ include $(CLEAR_VARS) 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 b84e1b65..0f8393f4 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 # ************************************************ |