diff options
| author | David Wagner <david.wagner@intel.com> | 2014-11-03 17:05:40 +0100 |
|---|---|---|
| committer | David Wagner <david.wagner@intel.com> | 2014-11-03 17:05:40 +0100 |
| commit | defaf69b1f62f0d358617b197e3c50254163dd68 (patch) | |
| tree | be56cb1341dc5bbfcd35d9cd826ba184382dbc2c | |
| parent | 4522ce2a7445a2de570de2a3835304a146e20e5e (diff) | |
| parent | cef5bbc708acd7a8653302f02646279ee3913d61 (diff) | |
| download | external_parameter-framework-defaf69b1f62f0d358617b197e3c50254163dd68.zip external_parameter-framework-defaf69b1f62f0d358617b197e3c50254163dd68.tar.gz external_parameter-framework-defaf69b1f62f0d358617b197e3c50254163dd68.tar.bz2 | |
Merge pull request #24 from 01org/fix-android-l-build
Remove libxml2-schemas target since it is now covered by the aosp
| -rw-r--r-- | parameter/Android.mk | 2 | ||||
| -rw-r--r-- | xmlserializer/Android.mk | 68 |
2 files changed, 2 insertions, 68 deletions
diff --git a/parameter/Android.mk b/parameter/Android.mk index 653ddd0..2027e97 100644 --- a/parameter/Android.mk +++ b/parameter/Android.mk @@ -178,7 +178,7 @@ LOCAL_C_INCLUDES += \ $(common_c_includes) LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)-host -LOCAL_STATIC_LIBRARIES := libxmlserializer_host libpfw_utility_host libxml2-schemas +LOCAL_STATIC_LIBRARIES := libxmlserializer_host libpfw_utility_host libxml2 LOCAL_LDLIBS += -ldl diff --git a/xmlserializer/Android.mk b/xmlserializer/Android.mk index f974a2c..769acf8 100644 --- a/xmlserializer/Android.mk +++ b/xmlserializer/Android.mk @@ -95,16 +95,10 @@ LOCAL_MODULE_TAGS := $(common_module_tags) LOCAL_CFLAGS := $(common_cflags) -# We must enforce this flag, otherwise schemas are never used. -# This is due to the fact that libxml2-schemas.a is compiled -# with those features enabled, but the xmlversion.h does -# not include those defines. -LOCAL_CFLAGS += -DLIBXML_SCHEMAS_ENABLED - LOCAL_C_INCLUDES += $(common_c_includes) LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)-host -LOCAL_STATIC_LIBRARIES := libxml2-schemas +LOCAL_STATIC_LIBRARIES := libxml2 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) @@ -127,63 +121,3 @@ LOCAL_MODULE_OWNER := intel LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_STATIC_LIBRARIES := libxml2 include $(BUILD_HOST_STATIC_LIBRARY) - -# -# libxml2-schemas -# -LOCAL_PATH := external/libxml2 -include $(CLEAR_VARS) -LOCAL_SRC_FILES := \ - SAX.c \ - entities.c \ - encoding.c \ - error.c \ - parserInternals.c \ - parser.c \ - tree.c \ - hash.c \ - list.c \ - xmlIO.c \ - xmlmemory.c \ - uri.c \ - valid.c \ - xlink.c \ - HTMLparser.c \ - HTMLtree.c \ - debugXML.c \ - xpath.c \ - xpointer.c \ - xinclude.c \ - nanohttp.c \ - nanoftp.c \ - DOCBparser.c \ - catalog.c \ - globals.c \ - threads.c \ - c14n.c \ - xmlstring.c \ - xmlregexp.c \ - xmlschemas.c \ - xmlschemastypes.c \ - xmlunicode.c \ - xmlreader.c \ - relaxng.c \ - dict.c \ - SAX2.c \ - legacy.c \ - chvalid.c \ - pattern.c \ - xmlsave.c \ - xmlmodule.c \ - xmlwriter.c \ - schematron.c - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/include external/icu/icu4c/source/common -LOCAL_CFLAGS := \ - -DLIBXML_EXPR_ENABLED \ - -DLIBXML_REGEXP_ENABLED \ - -DLIBXML_PATTERN_ENABLED \ - -DLIBXML_SCHEMAS_ENABLED \ - -DLIBXML_UNICODE_ENABLED -LOCAL_MODULE:= libxml2-schemas -include $(BUILD_HOST_STATIC_LIBRARY) |