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

Commit 7bb538bf authored by Dan Albert's avatar Dan Albert Committed by android-build-merger
Browse files

Merge "Auto-generate PLATFORM_VERSION_ALL_CODENAMES." am: 979dac69 am: e2b92d80 am: 6861a292

am: 9a9e7dd8

Change-Id: I66e18dbfa897f686f37e14f459e4f628b280d2d3
parents c2da1f51 9a9e7dd8
Loading
Loading
Loading
Loading
+17 −3
Original line number Original line Diff line number Diff line
@@ -76,8 +76,7 @@ endif
PLATFORM_VERSION.OPR1 := O
PLATFORM_VERSION.OPR1 := O
PLATFORM_VERSION.PPR1 := P
PLATFORM_VERSION.PPR1 := P


# 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
PLATFORM_VERSION_CODENAME.PPR1 := P


@@ -128,7 +127,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))