From 2d42461400d1aa1bc79ae6fcf0360e41f4467908 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Mon, 3 Apr 2023 22:19:00 +0000 Subject: [PATCH] Move PRODUCT_BRAND to module_common.mk So that we don't need to specify it in individual mainline modules products, which becomes more important after the internal ones only inherit from the common aosp product as opposed to the arch-specific ones. Bug: 249685973 Test: Diff'd the soong.variables files for the module_* products and saw no differences (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:211c5c2810e50a1c5d3bca2f1f7942b624fe3abe) Merged-In: If1733eb193cd3748fb3562d09bfd41651e2480f9 Change-Id: If1733eb193cd3748fb3562d09bfd41651e2480f9 --- target/product/module_arm.mk | 1 - target/product/module_arm64.mk | 1 - target/product/module_arm64only.mk | 1 - target/product/module_common.mk | 2 ++ target/product/module_x86.mk | 1 - target/product/module_x86_64.mk | 1 - target/product/module_x86_64only.mk | 1 - 7 files changed, 2 insertions(+), 6 deletions(-) diff --git a/target/product/module_arm.mk b/target/product/module_arm.mk index d99dce8b2b..434f7ad097 100644 --- a/target/product/module_arm.mk +++ b/target/product/module_arm.mk @@ -17,5 +17,4 @@ $(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 fc9529ce39..2e8c8a7f8b 100644 --- a/target/product/module_arm64.mk +++ b/target/product/module_arm64.mk @@ -18,5 +18,4 @@ $(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_arm64only.mk b/target/product/module_arm64only.mk index 4e8d53eb75..c0769bfa15 100644 --- a/target/product/module_arm64only.mk +++ b/target/product/module_arm64only.mk @@ -18,5 +18,4 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) PRODUCT_NAME := module_arm64only -PRODUCT_BRAND := Android PRODUCT_DEVICE := module_arm64only diff --git a/target/product/module_common.mk b/target/product/module_common.mk index ec670ee4c9..84bd799570 100644 --- a/target/product/module_common.mk +++ b/target/product/module_common.mk @@ -30,3 +30,5 @@ PRODUCT_MODULE_BUILD_FROM_SOURCE := true ifneq (,$(strip $(wildcard frameworks/base/Android.bp))) UNBUNDLED_BUILD_SDKS_FROM_SOURCE := true endif + +PRODUCT_BRAND := Android diff --git a/target/product/module_x86.mk b/target/product/module_x86.mk index b852e7a6de..f38e2b9793 100644 --- a/target/product/module_x86.mk +++ b/target/product/module_x86.mk @@ -17,5 +17,4 @@ $(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 f6bc1fc307..20f443a1e8 100644 --- a/target/product/module_x86_64.mk +++ b/target/product/module_x86_64.mk @@ -18,5 +18,4 @@ $(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 diff --git a/target/product/module_x86_64only.mk b/target/product/module_x86_64only.mk index bca4541efe..b0d72bfe2b 100644 --- a/target/product/module_x86_64only.mk +++ b/target/product/module_x86_64only.mk @@ -18,5 +18,4 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) PRODUCT_NAME := module_x86_64only -PRODUCT_BRAND := Android PRODUCT_DEVICE := module_x86_64only