Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7109fe18 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Gerrit Code Review
Browse files

Merge "Allow PLATFORM_VERSION_CODENAME to be overridden by... 

Merge "Allow PLATFORM_VERSION_CODENAME to be overridden by RELEASE_PLATFORM_VERSION_CODENAME_REL" into main
parents 7e730893 89f17ef4

core/version_defaults.mk

+2 −0
Original line number Diff line number Diff line
@@ -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

core/version_util.mk

+6 −0
Original line number Diff line number Diff line
@@ -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