diff options
| author | Mattijs Korpershoek <mattijsx.korpershoek@intel.com> | 2014-04-17 17:17:22 +0200 |
|---|---|---|
| committer | Mattijs Korpershoek <mattijsx.korpershoek@intel.com> | 2014-06-25 10:52:24 +0200 |
| commit | 0719893e44a7ada2e4fe46b97c173d0453bc0ded (patch) | |
| tree | ab6ed21bb7bee890964591411d99a059e5792871 /xmlserializer | |
| parent | dcbc3ecc3ac9dbf1065161422467658a3cc5dc4e (diff) | |
| download | external_parameter-framework-0719893e44a7ada2e4fe46b97c173d0453bc0ded.zip external_parameter-framework-0719893e44a7ada2e4fe46b97c173d0453bc0ded.tar.gz external_parameter-framework-0719893e44a7ada2e4fe46b97c173d0453bc0ded.tar.bz2 | |
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 <mattijsx.korpershoek@intel.com>
Diffstat (limited to 'xmlserializer')
| -rwxr-xr-x | xmlserializer/Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
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 |