tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Allow PLATFORM_VERSION_CODENAME to be overridden by RELEASE_PLATFORM_VERSION_CODENAME_REL" into main am: 7109fe1822 am: 1f9fe102a4

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

Change-Id: I40fc3a41687e20f0e8e13ca949d516b633599f91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Buynytskyy 2023-08-16 22:55:56 +00:00 committed by Automerger Merge Worker
commit f1ff31c714
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/version_defaults.mk
View file

@ -52,6 +52,8 @@ PLATFORM_VERSION_LAST_STABLE := 14
# 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

6
core/version_util.mk
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