From 89f17ef427357aaaac1326bebdbebf0b1c5dc6cf Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Fri, 14 Jul 2023 14:16:11 -0700 Subject: [PATCH] Allow PLATFORM_VERSION_CODENAME to be overridden by RELEASE_PLATFORM_VERSION_CODENAME_REL Bug: 282843732 Test: get_build_var PLATFORM_VERSION_CODENAME Change-Id: I16b9cf4ec8f395ceb192e35c18850fdab0a47df3 --- core/version_defaults.mk | 2 ++ core/version_util.mk | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index c107254f0b..ce2916d109 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -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 diff --git a/core/version_util.mk b/core/version_util.mk index d3fcdc25ce..457f0f704a 100644 --- a/core/version_util.mk +++ b/core/version_util.mk @@ -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