From 9ba0c563e48497f2f1c100c6fdb6759b882da551 Mon Sep 17 00:00:00 2001 From: Kevin Rocard Date: Tue, 7 May 2013 17:29:53 +0200 Subject: [xml serializer] Add support for host build BZ: 107991 In order to generate setting xml at build time, one need to build and run PFW environement on host. Add an host compilation target. Change-Id: I0684b40c9264f18c573d646857afded6c0d4e376 Signed-off-by: Kevin Rocard Reviewed-on: http://android.intel.com:8080/107268 Reviewed-by: cactus Reviewed-by: Gonzalve, Sebastien Tested-by: Dixon, CharlesX Reviewed-by: buildbot Tested-by: buildbot --- xmlserializer/Android.mk | 71 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 53 insertions(+), 18 deletions(-) (limited to 'xmlserializer') diff --git a/xmlserializer/Android.mk b/xmlserializer/Android.mk index d4dfda3..682f1d5 100644 --- a/xmlserializer/Android.mk +++ b/xmlserializer/Android.mk @@ -1,10 +1,9 @@ LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES) +#################### +# Common definitions -LOCAL_SRC_FILES := \ +COMMON_SRC_FILES := \ XmlElement.cpp \ XmlSerializingContext.cpp \ XmlDocSource.cpp \ @@ -15,28 +14,64 @@ LOCAL_SRC_FILES := \ XmlFileDocSink.cpp \ XmlFileDocSource.cpp -LOCAL_MODULE := libxmlserializer +COMMON_MODULE := libxmlserializer -LOCAL_MODULE_TAGS := optional +COMMON_MODULE_TAGS := optional -TARGET_ERROR_FLAGS += -Wno-non-virtual-dtor +COMMON_ERROR_FLAGS := -Wno-non-virtual-dtor -LOCAL_C_INCLUDES += +COMMON_C_INCLUDES := \ + external/libxml2/include/ \ + external/webkit/Source/WebCore/icu/ \ -LOCAL_C_INCLUDES += \ - external/stlport/stlport/ \ - external/libxml2/include/ \ - external/webkit/Source/WebCore/icu/ \ - bionic/libstdc++ \ - bionic/ +COMMON_SHARED_LIBRARIES := libicuuc +COMMON_STATIC_LIBRARIES := libxml2 + +COMMON_LDLIBS := -Lexternal/libxml2/lib + +############################# +# Target build -LOCAL_C_INCLUDES += +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := $(COMMON_SRC_FILES) + +LOCAL_MODULE := $(COMMON_MODULE) +LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS) -LOCAL_SHARED_LIBRARIES := libstlport libicuuc -LOCAL_STATIC_LIBRARIES := libxml2 +TARGET_ERROR_FLAGS += $(COMMON_ERROR_FLAGS) + +LOCAL_C_INCLUDES += \ + $(COMMON_C_INCLUDES) \ + external/stlport/stlport/ \ + bionic/libstdc++ \ + bionic/ -LOCAL_LDLIBS += -Lexternal/libxml2/lib +LOCAL_SHARED_LIBRARIES := $(COMMON_SHARED_LIBRARIES) libstlport +LOCAL_STATIC_LIBRARIES := $(COMMON_STATIC_LIBRARIES) +LOCAL_LDLIBS += $(COMMON_LDLIBS) include $(BUILD_SHARED_LIBRARY) +############################## +# Host build + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := $(COMMON_SRC_FILES) + +LOCAL_MODULE := $(COMMON_MODULE) +LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS) + +TARGET_ERROR_FLAGS += $(COMMON_ERROR_FLAGS) + +LOCAL_C_INCLUDES += \ + $(COMMON_C_INCLUDES) + +LOCAL_SHARED_LIBRARIES := $(COMMON_SHARED_LIBRARIES) +LOCAL_STATIC_LIBRARIES := $(COMMON_STATIC_LIBRARIES) + +LOCAL_LDLIBS += $(COMMON_LDLIBS) + +include $(BUILD_HOST_SHARED_LIBRARY) -- cgit v1.1