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

Commit 33ec5e0c authored by Lokesh Kumar Goel's avatar Lokesh Kumar Goel Committed by Automerger Merge Worker
Browse files

Merge "Allow PLATFORM_BASE_OS override from product config" into main am: a4007985 am: 8d2c3f39 

Original change: https://android-review.googlesource.com/c/platform/build/+/3028111



Change-Id: I94093a926aae67c77092cba917bcac5b70f873af
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 68951fff 8d2c3f39

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ _product_single_value_vars += PRODUCT_NAME 
_product_single_value_vars += PRODUCT_MODEL

_product_single_value_vars += PRODUCT_NAME_FOR_ATTESTATION

_product_single_value_vars += PRODUCT_MODEL_FOR_ATTESTATION

_product_single_value_vars += PRODUCT_BASE_OS



# Defines the ELF segment alignment for binaries (executables and shared libraries).

# The ELF segment alignment has to be a PAGE_SIZE multiple. For example, if

core/product_config.mk

+8 −0
Original line number Diff line number Diff line
@@ -311,6 +311,14 @@ endif 


TARGET_DEVICE := $(PRODUCT_DEVICE)



# Allow overriding PLATFORM_BASE_OS when PRODUCT_BASE_OS is defined

ifdef PRODUCT_BASE_OS

  PLATFORM_BASE_OS := $(PRODUCT_BASE_OS)

else

  PLATFORM_BASE_OS := $(PLATFORM_BASE_OS_ENV_INPUT)

endif

.KATI_READONLY := PLATFORM_BASE_OS



# TODO: also keep track of things like "port", "land" in product files.



# Figure out which resoure configuration options to use for this

core/version_util.mk

+11 −8
Original line number Diff line number Diff line
@@ -183,14 +183,17 @@ ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP 
endif

.KATI_READONLY := PLATFORM_SECURITY_PATCH_TIMESTAMP



ifndef PLATFORM_BASE_OS

  # Used to indicate the base os applied to the device.

  # Can be an arbitrary string, but must be a single word.

# PLATFORM_BASE_OS is used to indicate the base os applied

# to the device. Can be an arbitrary string, but must be a

# single word.

#

# If there is no $PLATFORM_BASE_OS set, keep it empty.

#

# PLATFORM_BASE_OS can either be set via an enviornment

# variable, or set via the PRODUCT_BASE_OS product variable.

PLATFORM_BASE_OS_ENV_INPUT := $(PLATFORM_BASE_OS)

.KATI_READONLY := PLATFORM_BASE_OS_ENV_INPUT

PLATFORM_BASE_OS :=

endif

.KATI_READONLY := PLATFORM_BASE_OS



ifndef BUILD_ID

  # Used to signify special builds.  E.g., branches and/or releases,