From e3ee81c3d0f2c7835ac191bf8f08a30de021f353 Mon Sep 17 00:00:00 2001 From: Qiming Shi Date: Wed, 25 Jun 2014 10:35:21 +0800 Subject: Fix multi-arch build issue LOCAL_MODULE_PATH is deprecated and in this case, useless. Change-Id: I72054e3a5c70c2779d170f07f24734d75fdf48f8 Signed-off-by: Qiming Shi Reviewed-on: https://android.intel.com/211229 Reviewed-by: cactus --- parameter/Android.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/parameter/Android.mk b/parameter/Android.mk index 145bb0c..5a3632f 100644 --- a/parameter/Android.mk +++ b/parameter/Android.mk @@ -150,8 +150,6 @@ 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) -- cgit v1.1 From 5ada13f33b51f6ad88098d42d7c160db80e2a800 Mon Sep 17 00:00:00 2001 From: David Wagner Date: Tue, 26 Aug 2014 15:18:15 +0200 Subject: Fix pthread compilation flags According to the sem_init(3) manpage, we must pass the -pthread flag at link-time when using it. When using pthread_join(3), this flag must also be passed at compile time. The flags were wrong for libremote-processor and were missing for test-platform_host. Change-Id: Iec2797592d6d25297c87ceb2983e87e75624a576 Signed-off-by: David Wagner --- remote-processor/Android.mk | 15 ++++++++------- test/test-platform/Android.mk | 4 ++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/remote-processor/Android.mk b/remote-processor/Android.mk index 913f037..af5d06f 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,11 @@ 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_TAGS := $(common_module_tags) include external/stlport/libstlport.mk include $(BUILD_SHARED_LIBRARY) @@ -76,10 +77,10 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(common_src_files) LOCAL_CFLAGS := $(common_cflags) +LOCAL_LDLIBS := $(common_ldlibs) LOCAL_MODULE := $(common_module)_host 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..0f58393 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 @@ -55,6 +57,7 @@ LOCAL_MODULE:= $(common_module) 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) @@ -73,6 +76,7 @@ LOCAL_MODULE:= $(common_module)_host 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), \ -- cgit v1.1 From c943ea6b1d01efd0dd582352db3f2d139997c982 Mon Sep 17 00:00:00 2001 From: David Wagner Date: Tue, 26 Aug 2014 17:41:53 +0200 Subject: Android.mk: declare intel as module owner This seems to be mandatory. Change-Id: Idba8c7a3ec9e2f05b28ee593d1d15a420a0bd9ed Signed-off-by: David Wagner --- Schemas/Android.mk | 10 ++++++++++ parameter/Android.mk | 4 ++++ remote-process/Android.mk | 2 ++ remote-processor/Android.mk | 2 ++ test/test-platform/Android.mk | 2 ++ tools/xmlGenerator/Android.mk | 5 +++++ utility/Android.mk | 2 ++ xmlserializer/Android.mk | 4 ++++ 8 files changed, 31 insertions(+) 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 5a3632f..bcb9739 100644 --- a/parameter/Android.mk +++ b/parameter/Android.mk @@ -155,6 +155,7 @@ 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) @@ -178,6 +179,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 += \ @@ -196,6 +198,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) @@ -212,6 +215,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 af5d06f..d3e5246 100644 --- a/remote-processor/Android.mk +++ b/remote-processor/Android.mk @@ -64,6 +64,7 @@ LOCAL_CFLAGS := $(common_cflags) LOCAL_LDLIBS := $(common_ldlibs) LOCAL_MODULE := $(common_module) +LOCAL_MODULE_OWNER := intel LOCAL_MODULE_TAGS := $(common_module_tags) include external/stlport/libstlport.mk @@ -80,6 +81,7 @@ LOCAL_CFLAGS := $(common_cflags) LOCAL_LDLIBS := $(common_ldlibs) LOCAL_MODULE := $(common_module)_host +LOCAL_MODULE_OWNER := intel LOCAL_MODULE_TAGS := $(common_module_tags) diff --git a/test/test-platform/Android.mk b/test/test-platform/Android.mk index 0f58393..a8dc619 100644 --- a/test/test-platform/Android.mk +++ b/test/test-platform/Android.mk @@ -54,6 +54,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_C_INCLUDES := $(common_c_includes) @@ -73,6 +74,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_C_INCLUDES += $(common_c_includes) 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 e6b06c1..ec1d084 100644 --- a/xmlserializer/Android.mk +++ b/xmlserializer/Android.mk @@ -68,6 +68,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) @@ -90,6 +91,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) @@ -113,6 +115,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) @@ -121,6 +124,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) -- cgit v1.1 From d15eee54ded5d6eb78a02af50f28f29fdd2350bb Mon Sep 17 00:00:00 2001 From: David Wagner Date: Fri, 24 Oct 2014 16:34:34 +0200 Subject: Android: xmlserializer: Update the path to the unicode includes The unicode library in AOSP's master branch has moved. libxml2 has been updated and xmlserializer needs to be too. Signed-off-by: David Wagner --- xmlserializer/Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmlserializer/Android.mk b/xmlserializer/Android.mk index ec1d084..3c5bb19 100644 --- a/xmlserializer/Android.mk +++ b/xmlserializer/Android.mk @@ -55,7 +55,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 @@ -179,7 +179,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 \ -- cgit v1.1 From 0c872ff72b6b6c9e263942e5d7b1c2de12531fb4 Mon Sep 17 00:00:00 2001 From: David Wagner Date: Fri, 24 Oct 2014 16:39:06 +0200 Subject: Android: Don't build libparameter with Clang It does not compile yet; this issue will have to be tackled. Signed-off-by: David Wagner --- parameter/Android.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/parameter/Android.mk b/parameter/Android.mk index bcb9739..de0aa73 100644 --- a/parameter/Android.mk +++ b/parameter/Android.mk @@ -163,6 +163,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) @@ -190,6 +191,7 @@ LOCAL_STATIC_LIBRARIES := libxmlserializer_host libpfw_utility_host libxml2-sche LOCAL_LDLIBS += -ldl +LOCAL_CLANG := false include $(BUILD_HOST_SHARED_LIBRARY) ################################ -- cgit v1.1