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

Merge "Filter REL out of PLATFORM_VERSION_ALL_CODENAMES." into main am: 624b0f4b2f

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

Change-Id: Ifbffd104bfb476c7eb8af3aa2eeefae8a103309b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-10-05 00:41:48 +00:00
committed by Automerger Merge Worker
parent a503a56283 624b0f4b2f
commit 175dd937e4
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/version_util.mk
View File

@@ -79,12 +79,23 @@ PLATFORM_VERSION_ALL_CODENAMES :=
# Build a list of all active code names. Avoid duplicates, and stop when we # Build a list of all active code names. Avoid duplicates, and stop when we
# reach a codename that matches PLATFORM_VERSION_CODENAME (anything beyond # reach a codename that matches PLATFORM_VERSION_CODENAME (anything beyond
# that is not included in our build). # that is not included in our build).
#
# REL is filtered out of the list. The codename of the current release is
# replaced by "REL" when the build is configured as a release rather than a
# preview. For example, PLATFORM_VERSION_CODENAME.UpsideDownCake will be "REL"
# rather than UpsideDownCake in a -next target when the upcoming release is
# UpsideDownCake. "REL" shouldn't really be treated as a codename though. It's a
# placeholder to indicate that the build is a release and so doesn't really have
# a codename. The list of all codenames ends up in
# ro.build.version.all_codenames, and also ends up feeding the logic for stub
# generation in soong, neither of which are places that should include REL.
_versions_in_target := \ _versions_in_target := \
$(call find_and_earlier,$(ALL_VERSIONS),$(TARGET_PLATFORM_VERSION)) $(call find_and_earlier,$(ALL_VERSIONS),$(TARGET_PLATFORM_VERSION))
$(foreach version,$(_versions_in_target),\ $(foreach version,$(_versions_in_target),\
$(eval _codename := $(PLATFORM_VERSION_CODENAME.$(version)))\ $(eval _codename := $(PLATFORM_VERSION_CODENAME.$(version)))\
$(if $(filter $(_codename),$(PLATFORM_VERSION_ALL_CODENAMES)),,\ $(if $(filter REL,$(_codename)),,\
$(eval PLATFORM_VERSION_ALL_CODENAMES += $(_codename)))) $(if $(filter $(_codename),$(PLATFORM_VERSION_ALL_CODENAMES)),,\
$(eval PLATFORM_VERSION_ALL_CODENAMES += $(_codename)))))
# And the list of actually all the codenames that are in preview. The # And the list of actually all the codenames that are in preview. The
# ALL_CODENAMES variable is sort of a lie for historical reasons and only # ALL_CODENAMES variable is sort of a lie for historical reasons and only