aboutsummaryrefslogtreecommitdiffstats
path: root/xmlserializer/Android.mk
diff options
context:
space:
mode:
authorMattijs Korpershoek <mattijsx.korpershoek@intel.com>2014-04-08 14:05:21 +0200
committerMattijs Korpershoek <mattijsx.korpershoek@intel.com>2014-06-25 10:52:20 +0200
commit3141891778a0564887d25b8b06b898daf3c1c9b5 (patch)
tree8774f6d48211002dc50ec654520b9d98aacf89a2 /xmlserializer/Android.mk
parentf394b389ff6202e94d42266ba39144bdcdefe3ba (diff)
downloadexternal_parameter-framework-3141891778a0564887d25b8b06b898daf3c1c9b5.zip
external_parameter-framework-3141891778a0564887d25b8b06b898daf3c1c9b5.tar.gz
external_parameter-framework-3141891778a0564887d25b8b06b898daf3c1c9b5.tar.bz2
Added possibility to toggle xml validation
BZ: 184054 It was not possible to enable/disable xml file validation. The parameter framework only relied on the LIBXML_SCHEMAS flag. This patchs implements a new constructor for XmlFiles which allows enabling/disabling xml/xsd check. Change-Id: I32d220a42bb27f4ce685f07cb194e78e76f44a5d Signed-off-by: Mattijs Korpershoek <mattijsx.korpershoek@intel.com>
Diffstat (limited to 'xmlserializer/Android.mk')
-rwxr-xr-xxmlserializer/Android.mk11
1 files changed, 2 insertions, 9 deletions
diff --git a/xmlserializer/Android.mk b/xmlserializer/Android.mk
index fabbf84..a5ab4e1 100755
--- a/xmlserializer/Android.mk
+++ b/xmlserializer/Android.mk
@@ -60,8 +60,6 @@ common_c_includes := \
common_shared_libraries := libicuuc
common_static_libraries := libxml2
-common_ldlibs := -Lexternal/libxml2/lib
-
#############################
# Target build
@@ -82,8 +80,6 @@ LOCAL_C_INCLUDES += \
LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libstlport
LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
-LOCAL_LDLIBS += $(common_ldlibs)
-
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
include $(BUILD_STATIC_LIBRARY)
@@ -100,13 +96,10 @@ LOCAL_MODULE_TAGS := $(common_module_tags)
LOCAL_CFLAGS := $(common_cflags)
-LOCAL_C_INCLUDES += \
- $(common_c_includes)
+LOCAL_C_INCLUDES += $(common_c_includes)
LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)-host
-LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
-
-LOCAL_LDLIBS += $(common_ldlibs)
+LOCAL_STATIC_LIBRARIES := libxml2-schemas
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)