diff options
| author | Tom Cherry <tomcherry@google.com> | 2015-04-10 23:33:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-10 23:33:46 +0000 |
| commit | 8eadaf82488fe3c7a106bb17e335447bef5c9bec (patch) | |
| tree | 7958a795b1a7fa6351217333e3271d6e79d82cb7 | |
| parent | ae6a8d8614ae0f8b91ea2143371eedd19878895a (diff) | |
| parent | aed4aad6b4aeac54ccd32156b8b7f869e71bfd64 (diff) | |
| download | android_external_libxml2-8eadaf82488fe3c7a106bb17e335447bef5c9bec.tar.gz android_external_libxml2-8eadaf82488fe3c7a106bb17e335447bef5c9bec.tar.bz2 android_external_libxml2-8eadaf82488fe3c7a106bb17e335447bef5c9bec.zip | |
Merge "Build libxml2 as a shared library additionally"
| -rw-r--r-- | Android.mk | 25 |
1 files changed, 21 insertions, 4 deletions
@@ -47,8 +47,6 @@ common_SRC_FILES := SAX.c entities.c encoding.c error.c \ common_C_INCLUDES += $(LOCAL_PATH)/include -common_CFLAGS += -fvisibility=hidden - common_CFLAGS += -DLIBXML_THREAD_ENABLED=1 common_CFLAGS += \ @@ -57,20 +55,39 @@ common_CFLAGS += \ -Wno-sign-compare \ -Wno-tautological-pointer-compare \ +# Static library +#======================================================= + include $(CLEAR_VARS) LOCAL_SRC_FILES := $(common_SRC_FILES) LOCAL_C_INCLUDES += $(common_C_INCLUDES) -LOCAL_CFLAGS += $(common_CFLAGS) +LOCAL_CFLAGS += $(common_CFLAGS) -fvisibility=hidden LOCAL_SHARED_LIBRARIES += libicuuc LOCAL_MODULE := libxml2 LOCAL_CLANG := true LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_LIBRARY) +# Shared library +#======================================================= + include $(CLEAR_VARS) LOCAL_SRC_FILES := $(common_SRC_FILES) -LOCAL_C_INCLUDES += $(common_C_INCLUDES) +LOCAL_C_INCLUDES := $(common_C_INCLUDES) LOCAL_CFLAGS += $(common_CFLAGS) +LOCAL_SHARED_LIBRARIES := libicuuc +LOCAL_MODULE:= libxml2 +LOCAL_CLANG := true +LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk +include $(BUILD_SHARED_LIBRARY) + +# For the host +# ======================================================== + +include $(CLEAR_VARS) +LOCAL_SRC_FILES := $(common_SRC_FILES) +LOCAL_C_INCLUDES += $(common_C_INCLUDES) +LOCAL_CFLAGS += $(common_CFLAGS) -fvisibility=hidden LOCAL_SHARED_LIBRARIES += libicuuc-host LOCAL_MODULE := libxml2 LOCAL_CLANG := true |