summaryrefslogtreecommitdiffstats
path: root/xmlserializer
diff options
context:
space:
mode:
authorDavid Wagner <david.wagner@intel.com>2014-10-24 17:49:53 +0200
committerDavid Wagner <david.wagner@intel.com>2014-10-24 17:49:53 +0200
commit4fbf2dfa5bda24b3cdb325e230e77314ddf8c93b (patch)
tree307b0e5390831ad00d1e232baa7601305575343b /xmlserializer
parentd9ad02e2a322fff355cd113c5bb98ff4667a95f2 (diff)
parent0c872ff72b6b6c9e263942e5d7b1c2de12531fb4 (diff)
downloadexternal_parameter-framework-4fbf2dfa5bda24b3cdb325e230e77314ddf8c93b.zip
external_parameter-framework-4fbf2dfa5bda24b3cdb325e230e77314ddf8c93b.tar.gz
external_parameter-framework-4fbf2dfa5bda24b3cdb325e230e77314ddf8c93b.tar.bz2
Merge pull request #20 from 01org/fix-build-issues-bis
Fix build issues bis
Diffstat (limited to 'xmlserializer')
-rw-r--r--xmlserializer/Android.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/xmlserializer/Android.mk b/xmlserializer/Android.mk
index 7109bf9..f974a2c 100644
--- a/xmlserializer/Android.mk
+++ b/xmlserializer/Android.mk
@@ -54,7 +54,7 @@ common_cflags := \
common_c_includes := \
external/libxml2/include \
- external/icu4c/common \
+ external/icu/icu4c/source/common \
common_shared_libraries := libicuuc
common_static_libraries := libxml2
@@ -67,6 +67,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(common_src_files)
LOCAL_MODULE := $(common_module)
+LOCAL_MODULE_OWNER := intel
LOCAL_MODULE_TAGS := $(common_module_tags)
LOCAL_CFLAGS := $(common_cflags)
@@ -89,6 +90,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(common_src_files)
LOCAL_MODULE := $(common_module)_host
+LOCAL_MODULE_OWNER := intel
LOCAL_MODULE_TAGS := $(common_module_tags)
LOCAL_CFLAGS := $(common_cflags)
@@ -112,6 +114,7 @@ include $(BUILD_HOST_STATIC_LIBRARY)
# Export includes for plugins (Target build)
include $(CLEAR_VARS)
LOCAL_MODULE := $(common_module)_includes
+LOCAL_MODULE_OWNER := intel
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
LOCAL_STATIC_LIBRARIES := libxml2
include $(BUILD_STATIC_LIBRARY)
@@ -120,6 +123,7 @@ include $(BUILD_STATIC_LIBRARY)
# Export includes for plugins (Host build)
include $(CLEAR_VARS)
LOCAL_MODULE := $(common_module)_includes
+LOCAL_MODULE_OWNER := intel
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
LOCAL_STATIC_LIBRARIES := libxml2
include $(BUILD_HOST_STATIC_LIBRARY)
@@ -174,7 +178,7 @@ LOCAL_SRC_FILES := \
xmlwriter.c \
schematron.c
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include external/icu4c/common
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include external/icu/icu4c/source/common
LOCAL_CFLAGS := \
-DLIBXML_EXPR_ENABLED \
-DLIBXML_REGEXP_ENABLED \