Convert Schemas.mk to Android.bpandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-release

Bug: 122332396
Test: Manual build + inspection
Change-Id: I85de491e9a74e063e7bec5a08aeabef87122f51d

3 files changed, 126 insertions, 147 deletions

diff --git a/Android.bp b/Android.bp
index 2dab6a7..dfb8a75 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,31 @@
+// Copyright (c) 2016, Intel Corporation
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this
+// list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation and/or
+// other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors
+// may be used to endorse or promote products derived from this software without
+// specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 cc_defaults {
     name: "pfw_defaults",
     host_supported: true,
@@ -186,3 +214,101 @@ cc_binary_host {
     shared_libs: ["libparameter"],
     srcs: ["upstream/tools/xmlGenerator/domainGeneratorConnector.cpp"],
 }
+
+// Resources are not compiled so the prebuild mechanism is used to export them.
+// Schemas are only used by host, in order to validate xml files
+//////////////////////////////////////////////////
+
+prebuilt_etc_host {
+    name: "ParameterFrameworkConfiguration.xsd",
+    owner: "intel",
+    src: "upstream/schemas/ParameterFrameworkConfiguration.xsd",
+    sub_dir: "parameter-framework/Schemas",
+}
+
+prebuilt_etc_host {
+    name: "ConfigurableDomain.xsd",
+    owner: "intel",
+    src: "upstream/schemas/ConfigurableDomain.xsd",
+    sub_dir: "parameter-framework/Schemas",
+    required: ["ParameterSettings.xsd"],
+}
+
+prebuilt_etc_host {
+    name: "ConfigurableDomains.xsd",
+    owner: "intel",
+    src: "upstream/schemas/ConfigurableDomains.xsd",
+    sub_dir: "parameter-framework/Schemas",
+    required: ["ConfigurableDomain.xsd"],
+}
+
+prebuilt_etc_host {
+    name: "SystemClass.xsd",
+    owner: "intel",
+    src: "upstream/schemas/SystemClass.xsd",
+    sub_dir: "parameter-framework/Schemas",
+    required: [
+        "FileIncluder.xsd",
+        "Subsystem.xsd",
+    ],
+}
+
+prebuilt_etc_host {
+    name: "ParameterSettings.xsd",
+    owner: "intel",
+    src: "upstream/schemas/ParameterSettings.xsd",
+    sub_dir: "parameter-framework/Schemas",
+}
+
+prebuilt_etc_host {
+    name: "FileIncluder.xsd",
+    owner: "intel",
+    src: "upstream/schemas/FileIncluder.xsd",
+    sub_dir: "parameter-framework/Schemas",
+}
+
+prebuilt_etc_host {
+    name: "Subsystem.xsd",
+    owner: "intel",
+    src: "upstream/schemas/Subsystem.xsd",
+    sub_dir: "parameter-framework/Schemas",
+    required: ["ComponentLibrary.xsd"],
+}
+
+prebuilt_etc_host {
+    name: "ComponentLibrary.xsd",
+    owner: "intel",
+    src: "upstream/schemas/ComponentLibrary.xsd",
+    sub_dir: "parameter-framework/Schemas",
+    required: [
+        "ComponentTypeSet.xsd",
+        "W3cXmlAttributes.xsd",
+    ],
+}
+
+prebuilt_etc_host {
+    name: "ComponentTypeSet.xsd",
+    owner: "intel",
+    src: "upstream/schemas/ComponentTypeSet.xsd",
+    sub_dir: "parameter-framework/Schemas",
+    required: [
+        "Parameter.xsd",
+        "W3cXmlAttributes.xsd",
+    ],
+}
+
+prebuilt_etc_host {
+    name: "W3cXmlAttributes.xsd",
+    owner: "intel",
+    src: "upstream/schemas/W3cXmlAttributes.xsd",
+    sub_dir: "parameter-framework/Schemas",
+}
+
+prebuilt_etc_host {
+    name: "Parameter.xsd",
+    owner: "intel",
+    src: "upstream/schemas/Parameter.xsd",
+    sub_dir: "parameter-framework/Schemas",
+}
+
+//////////////////////////////////////////////////
diff --git a/Android.mk b/Android.mk
index f3263cd..1af7763 100644
--- a/Android.mk
+++ b/Android.mk
@@ -29,4 +29,3 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(LOCAL_PATH)/XmlGenerator.mk
-include $(LOCAL_PATH)/Schemas.mk
diff --git a/Schemas.mk b/Schemas.mk
deleted file mode 100644
index 04856c6..0000000
--- a/Schemas.mk
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright (c) 2016, Intel Corporation
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-# list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation and/or
-# other materials provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors
-# may be used to endorse or promote products derived from this software without
-# specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Resources are not compiled so the prebuild mechanism is used to export them.
-# Schemas are only used by host, in order to validate xml files
-##################################################
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := ParameterFrameworkConfiguration.xsd
-LOCAL_MODULE_OWNER := intel
-LOCAL_SRC_FILES := upstream/schemas/$(LOCAL_MODULE)
-LOCAL_MODULE_CLASS = ETC
-LOCAL_MODULE_PATH := $(HOST_OUT)/etc/parameter-framework/Schemas
-LOCAL_IS_HOST_MODULE := true
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := ConfigurableDomain.xsd
-LOCAL_MODULE_OWNER := intel
-LOCAL_SRC_FILES := upstream/schemas/$(LOCAL_MODULE)
-LOCAL_MODULE_CLASS = ETC
-LOCAL_MODULE_PATH := $(HOST_OUT)/etc/parameter-framework/Schemas
-LOCAL_IS_HOST_MODULE := true
-LOCAL_REQUIRED_MODULES := \
-    ParameterSettings.xsd
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := ConfigurableDomains.xsd
-LOCAL_MODULE_OWNER := intel
-LOCAL_SRC_FILES := upstream/schemas/$(LOCAL_MODULE)
-LOCAL_MODULE_CLASS = ETC
-LOCAL_MODULE_PATH := $(HOST_OUT)/etc/parameter-framework/Schemas
-LOCAL_IS_HOST_MODULE := true
-LOCAL_REQUIRED_MODULES := \
-    ConfigurableDomain.xsd
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := SystemClass.xsd
-LOCAL_MODULE_OWNER := intel
-LOCAL_SRC_FILES := upstream/schemas/$(LOCAL_MODULE)
-LOCAL_MODULE_CLASS = ETC
-LOCAL_MODULE_PATH := $(HOST_OUT)/etc/parameter-framework/Schemas
-LOCAL_IS_HOST_MODULE := true
-LOCAL_REQUIRED_MODULES := \
-    FileIncluder.xsd \
-    Subsystem.xsd
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := ParameterSettings.xsd
-LOCAL_MODULE_OWNER := intel
-LOCAL_SRC_FILES := upstream/schemas/$(LOCAL_MODULE)
-LOCAL_MODULE_CLASS = ETC
-LOCAL_MODULE_PATH := $(HOST_OUT)/etc/parameter-framework/Schemas
-LOCAL_IS_HOST_MODULE := true
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := FileIncluder.xsd
-LOCAL_MODULE_OWNER := intel
-LOCAL_SRC_FILES := upstream/schemas/$(LOCAL_MODULE)
-LOCAL_MODULE_CLASS = ETC
-LOCAL_MODULE_PATH := $(HOST_OUT)/etc/parameter-framework/Schemas
-LOCAL_IS_HOST_MODULE := true
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := Subsystem.xsd
-LOCAL_MODULE_OWNER := intel
-LOCAL_SRC_FILES := upstream/schemas/$(LOCAL_MODULE)
-LOCAL_MODULE_CLASS = ETC
-LOCAL_MODULE_PATH := $(HOST_OUT)/etc/parameter-framework/Schemas
-LOCAL_IS_HOST_MODULE := true
-LOCAL_REQUIRED_MODULES := \
-    ComponentLibrary.xsd
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := ComponentLibrary.xsd
-LOCAL_MODULE_OWNER := intel
-LOCAL_SRC_FILES := upstream/schemas/$(LOCAL_MODULE)
-LOCAL_MODULE_CLASS = ETC
-LOCAL_MODULE_PATH := $(HOST_OUT)/etc/parameter-framework/Schemas
-LOCAL_IS_HOST_MODULE := true
-LOCAL_REQUIRED_MODULES := \
-    ComponentTypeSet.xsd \
-    W3cXmlAttributes.xsd
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := ComponentTypeSet.xsd
-LOCAL_MODULE_OWNER := intel
-LOCAL_SRC_FILES := upstream/schemas/$(LOCAL_MODULE)
-LOCAL_MODULE_CLASS = ETC
-LOCAL_MODULE_PATH := $(HOST_OUT)/etc/parameter-framework/Schemas
-LOCAL_IS_HOST_MODULE := true
-LOCAL_REQUIRED_MODULES := \
-    Parameter.xsd \
-    W3cXmlAttributes.xsd
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := W3cXmlAttributes.xsd
-LOCAL_MODULE_OWNER := intel
-LOCAL_SRC_FILES := upstream/schemas/$(LOCAL_MODULE)
-LOCAL_MODULE_CLASS = ETC
-LOCAL_MODULE_PATH := $(HOST_OUT)/etc/parameter-framework/Schemas
-LOCAL_IS_HOST_MODULE := true
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := Parameter.xsd
-LOCAL_MODULE_OWNER := intel
-LOCAL_SRC_FILES := upstream/schemas/$(LOCAL_MODULE)
-LOCAL_MODULE_CLASS = ETC
-LOCAL_MODULE_PATH := $(HOST_OUT)/etc/parameter-framework/Schemas
-LOCAL_IS_HOST_MODULE := true
-include $(BUILD_PREBUILT)
-##################################################