From bc0038f4c2c366f9e014b7402a95cddd88f6cfaf Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Tue, 12 Jan 2021 21:59:31 +0000 Subject: DO NOT MERGE Update OWNERS for SPL changes to version_defaults.mk Bug: 177356215 Change-Id: I4587ab4b0a76fea430c05209002e13ec5152ca1b --- OWNERS | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index 89cea0d300..7ca0945a4c 100644 --- a/OWNERS +++ b/OWNERS @@ -3,4 +3,6 @@ dwillemsen@google.com # for version updates per-file version_defaults.mk = aseaton@google.com -per-file version_defaults.mk = elisapascual@google.com \ No newline at end of file +per-file version_defaults.mk = elisapascual@google.com +per-file version_defaults.mk = lubomir@google.com +per-file version_defaults.mk = pscovanner@google.com \ No newline at end of file -- cgit v1.2.3 From d703d4e45356f60b4a116ad20e21969d393a1930 Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Wed, 13 Jan 2021 01:02:44 +0000 Subject: DO NOT MERGE Update OWNERS for SPL changes to version_defaults.mk Bug: 177356215 Change-Id: Icc582400ad03c9d59be0354f53072219be4de65e --- OWNERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OWNERS b/OWNERS index 1e9b7634f7..c630fe138f 100644 --- a/OWNERS +++ b/OWNERS @@ -9,3 +9,5 @@ per-file * = nanzhang@google.com # for version updates per-file version_defaults.mk = aseaton@google.com per-file version_defaults.mk = elisapascual@google.com +per-file version_defaults.mk = lubomir@google.com +per-file version_defaults.mk = pscovanner@google.com \ No newline at end of file -- cgit v1.2.3 From 02aea1327276bb3ba50ed4db0ce33d56a35d2c16 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Wed, 27 Jan 2021 20:21:45 +0000 Subject: Add top level product definitions for module_* devices. Test: lunch module_{arm,arm64,x86,x86_64} Inspect target arches in the banner Bug: 176171716 Merged-In: Iba7818cfc1385d3f84dce1ef95c2bb8d279926bb Change-Id: Iba7818cfc1385d3f84dce1ef95c2bb8d279926bb --- target/product/AndroidProducts.mk | 6 ++++++ target/product/module_arm.mk | 21 +++++++++++++++++++++ target/product/module_arm64.mk | 21 +++++++++++++++++++++ target/product/module_x86.mk | 21 +++++++++++++++++++++ target/product/module_x86_64.mk | 21 +++++++++++++++++++++ 5 files changed, 90 insertions(+) create mode 100644 target/product/module_arm.mk create mode 100644 target/product/module_arm64.mk create mode 100644 target/product/module_x86.mk create mode 100644 target/product/module_x86_64.mk diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index 4121bc10e2..f841fa2371 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -73,6 +73,12 @@ PRODUCT_MAKEFILES := \ endif +PRODUCT_MAKEFILES += \ + $(LOCAL_DIR)/module_arm.mk \ + $(LOCAL_DIR)/module_arm64.mk \ + $(LOCAL_DIR)/module_x86.mk \ + $(LOCAL_DIR)/module_x86_64.mk \ + COMMON_LUNCH_CHOICES := \ aosp_arm64-eng \ aosp_arm-eng \ diff --git a/target/product/module_arm.mk b/target/product/module_arm.mk new file mode 100644 index 0000000000..09ccf5fa0d --- /dev/null +++ b/target/product/module_arm.mk @@ -0,0 +1,21 @@ +# +# Copyright (C) 2021 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +$(call inherit-product, $(SRC_TARGET_DIR)/board/module_arm/device.mk) + +PRODUCT_NAME := module_arm +PRODUCT_BRAND := Android +PRODUCT_DEVICE := module_arm diff --git a/target/product/module_arm64.mk b/target/product/module_arm64.mk new file mode 100644 index 0000000000..468c9db9a5 --- /dev/null +++ b/target/product/module_arm64.mk @@ -0,0 +1,21 @@ +# +# Copyright (C) 2021 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +$(call inherit-product, $(SRC_TARGET_DIR)/board/module_arm64/device.mk) + +PRODUCT_NAME := module_arm64 +PRODUCT_BRAND := Android +PRODUCT_DEVICE := module_arm64 diff --git a/target/product/module_x86.mk b/target/product/module_x86.mk new file mode 100644 index 0000000000..dec4aedca0 --- /dev/null +++ b/target/product/module_x86.mk @@ -0,0 +1,21 @@ +# +# Copyright (C) 2021 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +$(call inherit-product, $(SRC_TARGET_DIR)/board/module_x86/device.mk) + +PRODUCT_NAME := module_x86 +PRODUCT_BRAND := Android +PRODUCT_DEVICE := module_x86 diff --git a/target/product/module_x86_64.mk b/target/product/module_x86_64.mk new file mode 100644 index 0000000000..5fabade708 --- /dev/null +++ b/target/product/module_x86_64.mk @@ -0,0 +1,21 @@ +# +# Copyright (C) 2021 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +$(call inherit-product, $(SRC_TARGET_DIR)/board/module_x86_64/device.mk) + +PRODUCT_NAME := module_x86_64 +PRODUCT_BRAND := Android +PRODUCT_DEVICE := module_x86_64 -- cgit v1.2.3