diff options
| author | Martin Stjernholm <mast@google.com> | 2021-01-27 20:21:45 +0000 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2021-02-02 12:18:24 +0000 |
| commit | 02aea1327276bb3ba50ed4db0ce33d56a35d2c16 (patch) | |
| tree | 3a6544c5870ece70ab66c6bf4a025a912da7ffc8 | |
| parent | c869291339b57852615aa8f78e027e894d589431 (diff) | |
| download | build-02aea1327276bb3ba50ed4db0ce33d56a35d2c16.tar.gz | |
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
| -rw-r--r-- | target/product/AndroidProducts.mk | 6 | ||||
| -rw-r--r-- | target/product/module_arm.mk | 21 | ||||
| -rw-r--r-- | target/product/module_arm64.mk | 21 | ||||
| -rw-r--r-- | target/product/module_x86.mk | 21 | ||||
| -rw-r--r-- | target/product/module_x86_64.mk | 21 |
5 files changed, 90 insertions, 0 deletions
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 |