Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d424614 authored by Cole Faust's avatar Cole Faust Committed by Cherrypicker Worker
Browse files

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
parent 960a4700

target/product/module_arm.mk

+0 −1
Original line number Diff line number Diff line
@@ -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

target/product/module_arm64.mk

+0 −1
Original line number Diff line number Diff line
@@ -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

target/product/module_arm64only.mk

+0 −1
Original line number Diff line number Diff line
@@ -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

target/product/module_common.mk

+2 −0
Original line number Diff line number Diff line
@@ -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

target/product/module_x86.mk

+0 −1
Original line number Diff line number Diff line
@@ -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