StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move PRODUCT_BRAND to module_common.mk

Browse Source 
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
This commit is contained in:
Cole Faust
2023-04-03 22:19:00 +00:00
committed by Cherrypicker Worker
parent 960a4700e0
commit 2d42461400
7 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
target/product/module_arm.mk
View File

@@ -17,5 +17,4 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk)
PRODUCT_NAME := module_arm PRODUCT_NAME := module_arm
PRODUCT_BRAND := Android
PRODUCT_DEVICE := module_arm PRODUCT_DEVICE := module_arm

1
target/product/module_arm64.mk
View File

@@ -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) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
PRODUCT_NAME := module_arm64 PRODUCT_NAME := module_arm64
PRODUCT_BRAND := Android
PRODUCT_DEVICE := module_arm64 PRODUCT_DEVICE := module_arm64

1
target/product/module_arm64only.mk
View File

@@ -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) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
PRODUCT_NAME := module_arm64only PRODUCT_NAME := module_arm64only
PRODUCT_BRAND := Android
PRODUCT_DEVICE := module_arm64only PRODUCT_DEVICE := module_arm64only

2
target/product/module_common.mk
View File

@@ -30,3 +30,5 @@ PRODUCT_MODULE_BUILD_FROM_SOURCE := true
ifneq (,$(strip $(wildcard frameworks/base/Android.bp))) ifneq (,$(strip $(wildcard frameworks/base/Android.bp)))
UNBUNDLED_BUILD_SDKS_FROM_SOURCE := true UNBUNDLED_BUILD_SDKS_FROM_SOURCE := true
endif endif
PRODUCT_BRAND := Android

1
target/product/module_x86.mk
View File

@@ -17,5 +17,4 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/module_common.mk)
PRODUCT_NAME := module_x86 PRODUCT_NAME := module_x86
PRODUCT_BRAND := Android
PRODUCT_DEVICE := module_x86 PRODUCT_DEVICE := module_x86

1
target/product/module_x86_64.mk
View File

@@ -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) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
PRODUCT_NAME := module_x86_64 PRODUCT_NAME := module_x86_64
PRODUCT_BRAND := Android
PRODUCT_DEVICE := module_x86_64 PRODUCT_DEVICE := module_x86_64

1
target/product/module_x86_64only.mk
View File

@@ -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) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
PRODUCT_NAME := module_x86_64only PRODUCT_NAME := module_x86_64only
PRODUCT_BRAND := Android
PRODUCT_DEVICE := module_x86_64only PRODUCT_DEVICE := module_x86_64only