From 0719893e44a7ada2e4fe46b97c173d0453bc0ded Mon Sep 17 00:00:00 2001 From: Mattijs Korpershoek Date: Thu, 17 Apr 2014 17:17:22 +0200 Subject: Fix xmlserializer makefile for schema validation BZ: 188323 For schema validation features, we are using a special version of libxml2 called libxml2-schemas (which contains the SCHEMAS feature). This is just a different static library build with that feature only for the parameter-framework. The problem with that, is that the include/xmlversion.h does not define the #LIBXML_SCHEMAS_ENABLED flag. So when including it in our project, the flag is not defined. This results in unexpected behaviour since validation was active in the static library, but never called because the flag was not defined. As a fix, we are defining the LIBXML_SCHEMAS_ENABLED flag in the makefile. Change-Id: Id56ae5b668e587171b11e7607f2603ab5e3341a1 Signed-off-by: Mattijs Korpershoek --- xmlserializer/Android.mk | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'xmlserializer') diff --git a/xmlserializer/Android.mk b/xmlserializer/Android.mk index a5ab4e1..cade7c6 100755 --- a/xmlserializer/Android.mk +++ b/xmlserializer/Android.mk @@ -96,6 +96,12 @@ 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 -- cgit v1.1