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

Merge "Allow PLATFORM_BASE_OS override from product config" into main am: a4007985ec

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

Change-Id: Ie0699447315012d2a1832ddeb4b0d5f827a3f32b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lokesh Kumar Goel
2024-08-02 15:16:14 +00:00
committed by Automerger Merge Worker
parent a74c3088ae a4007985ec
commit 8d2c3f399b
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/product.mk
View File

@@ -26,6 +26,7 @@ _product_single_value_vars += PRODUCT_NAME
_product_single_value_vars += PRODUCT_MODEL _product_single_value_vars += PRODUCT_MODEL
_product_single_value_vars += PRODUCT_NAME_FOR_ATTESTATION _product_single_value_vars += PRODUCT_NAME_FOR_ATTESTATION
_product_single_value_vars += PRODUCT_MODEL_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). # 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 # The ELF segment alignment has to be a PAGE_SIZE multiple. For example, if

8
core/product_config.mk
View File

@@ -311,6 +311,14 @@ endif
TARGET_DEVICE := $(PRODUCT_DEVICE) 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. # TODO: also keep track of things like "port", "land" in product files.
# Figure out which resoure configuration options to use for this # Figure out which resoure configuration options to use for this

19
core/version_util.mk
View File

@@ -183,14 +183,17 @@ ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP
endif endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH_TIMESTAMP .KATI_READONLY := PLATFORM_SECURITY_PATCH_TIMESTAMP
ifndef PLATFORM_BASE_OS # PLATFORM_BASE_OS is used to indicate the base os applied
# Used to indicate the base os applied to the device. # to the device. Can be an arbitrary string, but must be a
# Can be an arbitrary string, but must be a single word. # single word.
# #
# If there is no $PLATFORM_BASE_OS set, keep it empty. # If there is no $PLATFORM_BASE_OS set, keep it empty.
PLATFORM_BASE_OS := #
endif # PLATFORM_BASE_OS can either be set via an enviornment
.KATI_READONLY := PLATFORM_BASE_OS # 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 :=
ifndef BUILD_ID ifndef BUILD_ID
# Used to signify special builds. E.g., branches and/or releases, # Used to signify special builds. E.g., branches and/or releases,