From 50b9eb21a04d30c5c16dfb70bc264c1e568f2a51 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Thu, 29 Apr 2021 11:59:12 +0100 Subject: [PATCH] Revert "Make module_* inherit aosp_*" This reverts commit 708b854c4a333b92bd41023d7d92fafcd16ab8f2. The only diffs induced by using module_* are those incurred from using armv8 for the 64-bit variants. Bug: 185789027 Test: diff tests in mainline-prod and sc-mainline-prod Change-Id: I7ed5cf93d240a58b50b655b861dd60c6965aafff --- target/product/module_arm.mk | 3 ++- target/product/module_arm64.mk | 4 +++- target/product/module_x86.mk | 3 ++- target/product/module_x86_64.mk | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/target/product/module_arm.mk b/target/product/module_arm.mk index 0deb43df93..d99dce8b2b 100644 --- a/target/product/module_arm.mk +++ b/target/product/module_arm.mk @@ -14,7 +14,8 @@ # limitations under the License. # -$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.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 index 8effa785a9..fc9529ce39 100644 --- a/target/product/module_arm64.mk +++ b/target/product/module_arm64.mk @@ -14,7 +14,9 @@ # limitations under the License. # -$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm64.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 +PRODUCT_DEVICE := module_arm64 diff --git a/target/product/module_x86.mk b/target/product/module_x86.mk index 5f75c82b55..b852e7a6de 100644 --- a/target/product/module_x86.mk +++ b/target/product/module_x86.mk @@ -14,7 +14,8 @@ # limitations under the License. # -$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.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 index 9196cd2503..f6bc1fc307 100644 --- a/target/product/module_x86_64.mk +++ b/target/product/module_x86_64.mk @@ -14,7 +14,9 @@ # limitations under the License. # -$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.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 +PRODUCT_DEVICE := module_x86_64