From 4ca749cb1188c63ffb49cb13800a30f483d73942 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Tue, 2 Feb 2021 11:23:53 +0000 Subject: [PATCH] Merge the module_* device.mk files into their corresponding product mk files. To clean up an unnecessary indirection. Instead introduce a common file for module products. Test: lunch module_{arm,arm64,x86,x86_64} inspect the build banners Change-Id: Ia312431a664e731f5d801ee2671f62f5cd23bd51 --- target/board/module_arm64/device.mk | 19 ------------------- target/board/module_x86/device.mk | 18 ------------------ target/board/module_x86_64/device.mk | 19 ------------------- target/product/module_arm.mk | 2 +- target/product/module_arm64.mk | 3 ++- .../device.mk => product/module_common.mk} | 6 +++--- target/product/module_x86.mk | 2 +- target/product/module_x86_64.mk | 3 ++- 8 files changed, 9 insertions(+), 63 deletions(-) delete mode 100644 target/board/module_arm64/device.mk delete mode 100644 target/board/module_x86/device.mk delete mode 100644 target/board/module_x86_64/device.mk rename target/{board/module_arm/device.mk => product/module_common.mk} (75%) diff --git a/target/board/module_arm64/device.mk b/target/board/module_arm64/device.mk deleted file mode 100644 index 0d4c5430b3..0000000000 --- a/target/board/module_arm64/device.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2020 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, build/make/target/product/default_art_config.mk) -$(call inherit-product, build/make/target/product/core_64_bit.mk) -$(call inherit-product, build/make/target/product/languages_default.mk) diff --git a/target/board/module_x86/device.mk b/target/board/module_x86/device.mk deleted file mode 100644 index cceb987546..0000000000 --- a/target/board/module_x86/device.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2020 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, build/make/target/product/default_art_config.mk) -$(call inherit-product, build/make/target/product/languages_default.mk) diff --git a/target/board/module_x86_64/device.mk b/target/board/module_x86_64/device.mk deleted file mode 100644 index 0d4c5430b3..0000000000 --- a/target/board/module_x86_64/device.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2020 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, build/make/target/product/default_art_config.mk) -$(call inherit-product, build/make/target/product/core_64_bit.mk) -$(call inherit-product, build/make/target/product/languages_default.mk) diff --git a/target/product/module_arm.mk b/target/product/module_arm.mk index 09ccf5fa0d..d99dce8b2b 100644 --- a/target/product/module_arm.mk +++ b/target/product/module_arm.mk @@ -14,7 +14,7 @@ # limitations under the License. # -$(call inherit-product, $(SRC_TARGET_DIR)/board/module_arm/device.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk) PRODUCT_NAME := module_arm PRODUCT_BRAND := Android diff --git a/target/product/module_arm64.mk b/target/product/module_arm64.mk index 468c9db9a5..fc9529ce39 100644 --- a/target/product/module_arm64.mk +++ b/target/product/module_arm64.mk @@ -14,7 +14,8 @@ # limitations under the License. # -$(call inherit-product, $(SRC_TARGET_DIR)/board/module_arm64/device.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) PRODUCT_NAME := module_arm64 PRODUCT_BRAND := Android diff --git a/target/board/module_arm/device.mk b/target/product/module_common.mk similarity index 75% rename from target/board/module_arm/device.mk rename to target/product/module_common.mk index cceb987546..eedd47999c 100644 --- a/target/board/module_arm/device.mk +++ b/target/product/module_common.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2020 The Android Open Source Project +# 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. @@ -14,5 +14,5 @@ # limitations under the License. # -$(call inherit-product, build/make/target/product/default_art_config.mk) -$(call inherit-product, build/make/target/product/languages_default.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/default_art_config.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk) diff --git a/target/product/module_x86.mk b/target/product/module_x86.mk index dec4aedca0..b852e7a6de 100644 --- a/target/product/module_x86.mk +++ b/target/product/module_x86.mk @@ -14,7 +14,7 @@ # limitations under the License. # -$(call inherit-product, $(SRC_TARGET_DIR)/board/module_x86/device.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk) PRODUCT_NAME := module_x86 PRODUCT_BRAND := Android diff --git a/target/product/module_x86_64.mk b/target/product/module_x86_64.mk index 5fabade708..f6bc1fc307 100644 --- a/target/product/module_x86_64.mk +++ b/target/product/module_x86_64.mk @@ -14,7 +14,8 @@ # limitations under the License. # -$(call inherit-product, $(SRC_TARGET_DIR)/board/module_x86_64/device.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) PRODUCT_NAME := module_x86_64 PRODUCT_BRAND := Android