diff options
| -rw-r--r-- | Schemas/Android.mk | 10 | ||||
| -rw-r--r-- | parameter/Android.mk | 8 | ||||
| -rw-r--r-- | remote-process/Android.mk | 2 | ||||
| -rw-r--r-- | remote-processor/Android.mk | 17 | ||||
| -rw-r--r-- | test/test-platform/Android.mk | 6 | ||||
| -rw-r--r-- | tools/xmlGenerator/Android.mk | 5 | ||||
| -rw-r--r-- | utility/Android.mk | 2 | ||||
| -rw-r--r-- | xmlserializer/Android.mk | 8 |
8 files changed, 47 insertions, 11 deletions
diff --git a/Schemas/Android.mk b/Schemas/Android.mk index 8ebfb3d..7a42a50 100644 --- a/Schemas/Android.mk +++ b/Schemas/Android.mk @@ -26,6 +26,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := ParameterFrameworkConfiguration.xsd +LOCAL_MODULE_OWNER := intel LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_CLASS = ETC LOCAL_MODULE_PATH := $(HOST_OUT)/etc/parameter-framework/Schemas @@ -34,6 +35,7 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := ConfigurableDomains.xsd +LOCAL_MODULE_OWNER := intel LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_CLASS = ETC LOCAL_MODULE_PATH := $(HOST_OUT)/etc/parameter-framework/Schemas @@ -44,6 +46,7 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := SystemClass.xsd +LOCAL_MODULE_OWNER := intel LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_CLASS = ETC LOCAL_MODULE_PATH := $(HOST_OUT)/etc/parameter-framework/Schemas @@ -55,6 +58,7 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := ParameterSettings.xsd +LOCAL_MODULE_OWNER := intel LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_CLASS = ETC LOCAL_MODULE_PATH := $(HOST_OUT)/etc/parameter-framework/Schemas @@ -63,6 +67,7 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := FileIncluder.xsd +LOCAL_MODULE_OWNER := intel LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_CLASS = ETC LOCAL_MODULE_PATH := $(HOST_OUT)/etc/parameter-framework/Schemas @@ -71,6 +76,7 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := Subsystem.xsd +LOCAL_MODULE_OWNER := intel LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_CLASS = ETC LOCAL_MODULE_PATH := $(HOST_OUT)/etc/parameter-framework/Schemas @@ -81,6 +87,7 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := ComponentLibrary.xsd +LOCAL_MODULE_OWNER := intel LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_CLASS = ETC LOCAL_MODULE_PATH := $(HOST_OUT)/etc/parameter-framework/Schemas @@ -92,6 +99,7 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := ComponentTypeSet.xsd +LOCAL_MODULE_OWNER := intel LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_CLASS = ETC LOCAL_MODULE_PATH := $(HOST_OUT)/etc/parameter-framework/Schemas @@ -103,6 +111,7 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := W3cXmlAttributes.xsd +LOCAL_MODULE_OWNER := intel LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_CLASS = ETC LOCAL_MODULE_PATH := $(HOST_OUT)/etc/parameter-framework/Schemas @@ -111,6 +120,7 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := Parameter.xsd +LOCAL_MODULE_OWNER := intel LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_CLASS = ETC LOCAL_MODULE_PATH := $(HOST_OUT)/etc/parameter-framework/Schemas diff --git a/parameter/Android.mk b/parameter/Android.mk index 778fed9..653ddd0 100644 --- a/parameter/Android.mk +++ b/parameter/Android.mk @@ -141,13 +141,12 @@ include $(CLEAR_VARS) LOCAL_COPY_HEADERS_TO := $(common_copy_headers_to) LOCAL_COPY_HEADERS := $(common_copy_headers) -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES) - LOCAL_CFLAGS := $(common_cflags) LOCAL_SRC_FILES := $(common_src_files) LOCAL_MODULE := $(common_module) +LOCAL_MODULE_OWNER := intel LOCAL_MODULE_TAGS := $(common_module_tags) LOCAL_C_INCLUDES := $(common_c_includes) @@ -155,6 +154,7 @@ LOCAL_C_INCLUDES := $(common_c_includes) LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libdl LOCAL_STATIC_LIBRARIES := libxmlserializer libpfw_utility libxml2 +LOCAL_CLANG := false include external/stlport/libstlport.mk include $(BUILD_SHARED_LIBRARY) @@ -171,6 +171,7 @@ LOCAL_CFLAGS := $(common_cflags) -O0 -ggdb LOCAL_SRC_FILES := $(common_src_files) LOCAL_MODULE := $(common_module)_host +LOCAL_MODULE_OWNER := intel LOCAL_MODULE_TAGS := $(common_module_tags) LOCAL_C_INCLUDES += \ @@ -181,6 +182,7 @@ LOCAL_STATIC_LIBRARIES := libxmlserializer_host libpfw_utility_host libxml2-sche LOCAL_LDLIBS += -ldl +LOCAL_CLANG := false include $(BUILD_HOST_SHARED_LIBRARY) ################################ @@ -189,6 +191,7 @@ include $(BUILD_HOST_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := $(common_module)_includes +LOCAL_MODULE_OWNER := intel LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) @@ -205,6 +208,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := $(common_module)_includes_host +LOCAL_MODULE_OWNER := intel LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) diff --git a/remote-process/Android.mk b/remote-process/Android.mk index 732f579..c842b2d 100644 --- a/remote-process/Android.mk +++ b/remote-process/Android.mk @@ -57,6 +57,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) @@ -78,6 +79,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) diff --git a/remote-processor/Android.mk b/remote-processor/Android.mk index 913f037..d3e5246 100644 --- a/remote-processor/Android.mk +++ b/remote-processor/Android.mk @@ -48,9 +48,11 @@ common_cflags := \ -Wall \ -Werror \ -Wextra \ - -Wno-unused-parameter + -Wno-unused-parameter \ + -pthread + +common_ldlibs := -pthread -common_ldlibs := -lpthread ############################# # Target build @@ -58,12 +60,12 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(common_src_files) -LOCAL_MODULE := $(common_module) -LOCAL_MODULE_TAGS := $(common_module_tags) - LOCAL_CFLAGS := $(common_cflags) +LOCAL_LDLIBS := $(common_ldlibs) -LOCAL_LDLIBS += $(common_ldlibs) +LOCAL_MODULE := $(common_module) +LOCAL_MODULE_OWNER := intel +LOCAL_MODULE_TAGS := $(common_module_tags) include external/stlport/libstlport.mk include $(BUILD_SHARED_LIBRARY) @@ -76,10 +78,11 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(common_src_files) LOCAL_CFLAGS := $(common_cflags) +LOCAL_LDLIBS := $(common_ldlibs) LOCAL_MODULE := $(common_module)_host +LOCAL_MODULE_OWNER := intel LOCAL_MODULE_TAGS := $(common_module_tags) -LOCAL_LDLIBS += $(common_ldlibs) include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/test/test-platform/Android.mk b/test/test-platform/Android.mk index a0ad8ba..a8dc619 100644 --- a/test/test-platform/Android.mk +++ b/test/test-platform/Android.mk @@ -43,6 +43,8 @@ common_c_includes := \ $(LOCAL_PATH)/../../parameter/include \ $(LOCAL_PATH)/../../remote-processor/ +common_ldlibs := -pthread + common_shared_libraries := libparameter libremote-processor ############################# # Target build @@ -52,9 +54,11 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES:= $(common_src_files) LOCAL_MODULE:= $(common_module) +LOCAL_MODULE_OWNER := intel LOCAL_MODULE_TAGS := $(common_module_tags) LOCAL_C_INCLUDES := $(common_c_includes) +LOCAL_LDLIBS := $(common_ldlibs) LOCAL_STATIC_LIBRARIES := libpfw_utility LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) @@ -70,9 +74,11 @@ 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_C_INCLUDES += $(common_c_includes) +LOCAL_LDLIBS := $(common_ldlibs) LOCAL_STATIC_LIBRARIES := libpfw_utility_host LOCAL_SHARED_LIBRARIES := $(foreach shared_library, $(common_shared_libraries), \ diff --git a/tools/xmlGenerator/Android.mk b/tools/xmlGenerator/Android.mk index 452668e..ebbc9e3 100644 --- a/tools/xmlGenerator/Android.mk +++ b/tools/xmlGenerator/Android.mk @@ -34,6 +34,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := PFWScriptGenerator.py +LOCAL_MODULE_OWNER := intel LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_IS_HOST_MODULE := true @@ -41,6 +42,7 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := hostConfig.py +LOCAL_MODULE_OWNER := intel LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_IS_HOST_MODULE := true @@ -48,6 +50,7 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := portAllocator.py +LOCAL_MODULE_OWNER := intel LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_IS_HOST_MODULE := true @@ -55,6 +58,7 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := hostDomainGenerator.sh +LOCAL_MODULE_OWNER := intel LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_REQUIRED_MODULES := \ PFWScriptGenerator.py \ @@ -78,6 +82,7 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := lightRoutingUpdate.sh +LOCAL_MODULE_OWNER := intel LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_REQUIRED_MODULES := \ PFWScriptGenerator.py diff --git a/utility/Android.mk b/utility/Android.mk index a224fe7..85b6c42 100644 --- a/utility/Android.mk +++ b/utility/Android.mk @@ -55,6 +55,7 @@ LOCAL_SRC_FILES := $(common_src_files) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_MODULE := $(common_module) +LOCAL_MODULE_OWNER := intel LOCAL_MODULE_TAGS := $(common_module_tags) LOCAL_CFLAGS := $(common_cflags) @@ -72,6 +73,7 @@ LOCAL_SRC_FILES := $(common_src_files) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_MODULE := $(common_module)_host +LOCAL_MODULE_OWNER := intel LOCAL_MODULE_TAGS := $(common_module_tags) LOCAL_CFLAGS := $(common_cflags) 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 \ |