StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop the PLATFORM_VERSION_CODENAME conditional

Browse Source 
Evaluate the list of all active codenames when version_util.mk is
invoked.

Bug: 230720688
Change-Id: I1c6a3e94230e856cf41f1f79b37893576957dc3d
Signed-off-by: Sebastian Ene <sebastianene@google.com>
This commit is contained in:
Sebastian Ene
2022-04-27 09:32:39 +00:00
parent 4faef3876d
commit 573fbcd114
1 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/version_util.mk
View File

@@ -56,7 +56,6 @@ MAX_PLATFORM_VERSION :=
# unreleased API level targetable by this branch, not just those that are valid # unreleased API level targetable by this branch, not just those that are valid
# lunch targets for this branch. # lunch targets for this branch.
ifndef PLATFORM_VERSION_CODENAME
PLATFORM_VERSION_CODENAME := $(PLATFORM_VERSION_CODENAME.$(TARGET_PLATFORM_VERSION)) PLATFORM_VERSION_CODENAME := $(PLATFORM_VERSION_CODENAME.$(TARGET_PLATFORM_VERSION))
ifndef PLATFORM_VERSION_CODENAME ifndef PLATFORM_VERSION_CODENAME
# PLATFORM_VERSION_CODENAME falls back to TARGET_PLATFORM_VERSION # PLATFORM_VERSION_CODENAME falls back to TARGET_PLATFORM_VERSION
@@ -85,7 +84,6 @@ ifndef PLATFORM_VERSION_CODENAME
PLATFORM_VERSION_ALL_CODENAMES := \ PLATFORM_VERSION_ALL_CODENAMES := \
$(subst $(space),$(comma),$(strip $(PLATFORM_VERSION_ALL_CODENAMES))) $(subst $(space),$(comma),$(strip $(PLATFORM_VERSION_ALL_CODENAMES)))
endif
.KATI_READONLY := \ .KATI_READONLY := \
PLATFORM_VERSION_CODENAME \ PLATFORM_VERSION_CODENAME \
PLATFORM_VERSION_ALL_CODENAMES PLATFORM_VERSION_ALL_CODENAMES