summaryrefslogtreecommitdiffstats
path: root/parameter/Android.mk
diff options
context:
space:
mode:
authorMattijs Korpershoek <mattijsx.korpershoek@intel.com>2014-04-08 14:10:03 +0200
committerMattijs Korpershoek <mattijsx.korpershoek@intel.com>2014-06-25 10:52:21 +0200
commitcce85f6b6691e4b1ddb81171e3ca5b5aeb71e6b9 (patch)
tree8f797fac149da0d4e54c2e40b224a76cb9242c47 /parameter/Android.mk
parent3141891778a0564887d25b8b06b898daf3c1c9b5 (diff)
downloadexternal_parameter-framework-cce85f6b6691e4b1ddb81171e3ca5b5aeb71e6b9.zip
external_parameter-framework-cce85f6b6691e4b1ddb81171e3ca5b5aeb71e6b9.tar.gz
external_parameter-framework-cce85f6b6691e4b1ddb81171e3ca5b5aeb71e6b9.tar.bz2
Test-platform enable/disable xml validation
BZ: 184054 test-platform has no way to tell to the parameter framework that it wants the parameter framework to validate xmls on loading. New command added to test-platform executable. setValidateSchemasOnStart true|false If set to true, the parameter framework will try to validate the .xmls with the .xsds located next to them. If set to false, it will never attempt to validate. SetValidateSchemas is false by default to allow backward compatibility. Note(a): This assumes that the script is able to find the .xsd files (which should be in /tmp/Schemas/). Change-Id: I7a5b0bc09d31e6647d8c631380d31503666e7e7b Signed-off-by: Mattijs Korpershoek <mattijsx.korpershoek@intel.com>
Diffstat (limited to 'parameter/Android.mk')
-rw-r--r--[-rwxr-xr-x]parameter/Android.mk10
1 files changed, 4 insertions, 6 deletions
diff --git a/parameter/Android.mk b/parameter/Android.mk
index dd0c71d..04e201c 100755..100644
--- a/parameter/Android.mk
+++ b/parameter/Android.mk
@@ -141,7 +141,6 @@ common_c_includes := \
$(LOCAL_PATH)/../remote-processor/
common_shared_libraries := libicuuc
-common_static_libraries := libxml2
#############################
# Target build
@@ -166,7 +165,7 @@ LOCAL_C_INCLUDES += \
bionic/
LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libdl libstlport
-LOCAL_STATIC_LIBRARIES := libxmlserializer libpfw_utility $(common_static_libraries)
+LOCAL_STATIC_LIBRARIES := libxmlserializer libpfw_utility libxml2
include $(BUILD_SHARED_LIBRARY)
@@ -189,7 +188,7 @@ LOCAL_C_INCLUDES += \
$(common_c_includes)
LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)-host
-LOCAL_STATIC_LIBRARIES := libxmlserializer_host libpfw_utility_host $(common_static_libraries)
+LOCAL_STATIC_LIBRARIES := libxmlserializer_host libpfw_utility_host libxml2-schemas
LOCAL_LDLIBS += -ldl
@@ -207,7 +206,7 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
LOCAL_STATIC_LIBRARIES := \
libxmlserializer \
libpfw_utility \
- $(common_static_libraries)
+ libxml2
include $(BUILD_STATIC_LIBRARY)
@@ -223,7 +222,6 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
LOCAL_STATIC_LIBRARIES := \
libxmlserializer_host \
libpfw_utility_host \
- $(common_static_libraries)
+ libxml2
include $(BUILD_HOST_STATIC_LIBRARY)
-