p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Auto-generate PLATFORM_VERSION_ALL_CODENAMES." am: 979dac690a 

am: e2b92d809f

Change-Id: I9cb0b52b1121146aa75ffff31e63ae5118ad9510
This commit is contained in:
Dan Albert 2017-03-31 23:12:11 +00:00 committed by android-build-merger
parent df187b1ba7 e2b92d809f
commit 6861a292a0
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/version_defaults.mk
View File

@ -75,9 +75,9 @@ endif
# cts/tests/tests/os/assets/platform_versions.txt # cts/tests/tests/os/assets/platform_versions.txt
PLATFORM_VERSION.OPR1 := O PLATFORM_VERSION.OPR1 := O
# This is the current development code-name, if the build is not a final # These are the current development codenames.
# release build. If this is a final release build, it is simply "REL".
PLATFORM_VERSION_CODENAME.OPR1 := O PLATFORM_VERSION_CODENAME.OPR1 := O
PLATFORM_VERSION_CODENAME.PPR1 := P
ifndef PLATFORM_VERSION ifndef PLATFORM_VERSION
PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION)) PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION))
@ -126,7 +126,22 @@ ifndef PLATFORM_VERSION_CODENAME
# This is all of the development codenames that are active. Should be either # This is all of the development codenames that are active. Should be either
# the same as PLATFORM_VERSION_CODENAME or a comma-separated list of additional # the same as PLATFORM_VERSION_CODENAME or a comma-separated list of additional
# codenames after PLATFORM_VERSION_CODENAME. # codenames after PLATFORM_VERSION_CODENAME.
PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME) PLATFORM_VERSION_ALL_CODENAMES :=
# Build a list of all possible code names. Avoid duplicates, and stop when we
# reach a codename that matches PLATFORM_VERSION_CODENAME (anything beyond
# that is not included in our build.
_versions_in_target := \
$(call find_and_earlier,$(ALL_VERSIONS),$(TARGET_PLATFORM_VERSION))
$(foreach version,$(_versions_in_target),\
$(eval _codename := $(PLATFORM_VERSION_CODENAME.$(version)))\
$(if $(filter $(_codename),$(PLATFORM_VERSION_ALL_CODENAMES)),,\
$(eval PLATFORM_VERSION_ALL_CODENAMES += $(_codename))))
# And convert from space separated to comma separated.
PLATFORM_VERSION_ALL_CODENAMES := \
$(subst $(space),$(comma),$(strip $(PLATFORM_VERSION_ALL_CODENAMES)))
endif endif
ifeq (REL,$(PLATFORM_VERSION_CODENAME)) ifeq (REL,$(PLATFORM_VERSION_CODENAME))