Merge "Allow PLATFORM_VERSION_CODENAME to be overridden by RELEASE_PLATFORM_VERSION_CODENAME_REL" into main

This commit is contained in:
Alex Buynytskyy
2023-08-16 21:27:21 +00:00
committed by Gerrit Code Review
2 changed files with 8 additions and 0 deletions

View File

@@ -52,6 +52,8 @@ PLATFORM_VERSION_LAST_STABLE := 13
# These are the current development codenames, if the build is not a final
# release build. If this is a final release build, it is simply "REL".
# Note that this may be overridden by RELEASE_VERSION_CODENAME_REL in
# version_util.mk.
PLATFORM_VERSION_CODENAME.UP1A := UpsideDownCake
PLATFORM_VERSION_CODENAME.VP1A := VanillaIceCream

View File

@@ -56,6 +56,12 @@ MAX_PLATFORM_VERSION :=
# unreleased API level targetable by this branch, not just those that are valid
# lunch targets for this branch.
# Release config flag to override the current version to REL. Note that the
# codename can also be locked to REL by setting it in versino_defaults.mk.
ifneq ($(RELEASE_PLATFORM_VERSION_CODENAME_REL),)
PLATFORM_VERSION_CODENAME.$(TARGET_PLATFORM_VERSION) := REL
endif
PLATFORM_VERSION_CODENAME := $(PLATFORM_VERSION_CODENAME.$(TARGET_PLATFORM_VERSION))
ifndef PLATFORM_VERSION_CODENAME
# PLATFORM_VERSION_CODENAME falls back to TARGET_PLATFORM_VERSION