[coastguard skipped] Merge sparse cherrypicks from sparse-12192237-L48700030005686605 into 24Q3-release.
COASTGUARD_SKIP: I7c4a1f291bb426ad599e1dc937e6ecd3889b5820
COASTGUARD_SKIP: Ia57ae5d45ff59cb31bac1abf985a5e9e466be096
Change-Id: I03248cd4692092e938c2ded13379f15816b8eaa3
diff --git a/core/build_id.mk b/core/build_id.mk
index 623900b..5114822 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
-BUILD_ID=AP3A.240905.014.X1
+BUILD_ID=AP3A.240905.014
diff --git a/core/product.mk b/core/product.mk
index 33a70fe..d469c0e 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -26,7 +26,6 @@
_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
diff --git a/core/product_config.mk b/core/product_config.mk
index 955b0a2..f939690 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -311,14 +311,6 @@
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
diff --git a/core/version_util.mk b/core/version_util.mk
index 0e34634..eb568be 100644
--- a/core/version_util.mk
+++ b/core/version_util.mk
@@ -183,17 +183,14 @@
endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH_TIMESTAMP
-# 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 :=
+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.
+ #
+ # If there is no $PLATFORM_BASE_OS set, keep it empty.
+ PLATFORM_BASE_OS :=
+endif
+.KATI_READONLY := PLATFORM_BASE_OS
ifndef BUILD_ID
# Used to signify special builds. E.g., branches and/or releases,