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

Commit abe575d1 authored by Jooyung Han's avatar Jooyung Han
Browse files

Remove PLATFORM_VERSION_FUTURE_CODENAMES 

It has been wrong to split ALL_VERSIONS into exclusive two sets of
before/after TARGET_PLATFORM_VERSION.

And PLATFORM_VERSION_ALL_CODENAMES supports all *active* list of
non-finalized codenames.

Bug: 152960049
Test: m
Change-Id: I1e87206a7f261e587cf079cb6b7025ca16aa4fe4
parent 870dbc02

core/soong_config.mk

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ $(call add_json_val, Platform_sdk_version, $(PLATFORM_SDK_VERSION) 
$(call add_json_str,  Platform_sdk_codename,             $(PLATFORM_VERSION_CODENAME))

$(call add_json_bool, Platform_sdk_final,                $(filter REL,$(PLATFORM_VERSION_CODENAME)))

$(call add_json_csv,  Platform_version_active_codenames, $(PLATFORM_VERSION_ALL_CODENAMES))

$(call add_json_csv,  Platform_version_future_codenames, $(PLATFORM_VERSION_FUTURE_CODENAMES))

$(call add_json_str,  Platform_security_patch,           $(PLATFORM_SECURITY_PATCH))

$(call add_json_str,  Platform_preview_sdk_version,      $(PLATFORM_PREVIEW_SDK_VERSION))

$(call add_json_str,  Platform_base_os,                  $(PLATFORM_BASE_OS))

core/version_defaults.mk

+3 −18
Original line number Diff line number Diff line
@@ -102,8 +102,8 @@ ifndef PLATFORM_VERSION_CODENAME 
    PLATFORM_VERSION_CODENAME := $(TARGET_PLATFORM_VERSION)

  endif



  # This is all of the *active* development codenames. There are future

  # codenames not included in this list. This confusing name is needed because

  # This is all of the *active* development codenames.

  # This confusing name is needed because

  # all_codenames has been baked into build.prop for ages.

  #

  # Should be either the same as PLATFORM_VERSION_CODENAME or a comma-separated
@@ -120,29 +120,14 @@ ifndef PLATFORM_VERSION_CODENAME 
    $(if $(filter $(_codename),$(PLATFORM_VERSION_ALL_CODENAMES)),,\

      $(eval PLATFORM_VERSION_ALL_CODENAMES += $(_codename))))



  # This is all of the inactive development codenames. Available to be targeted

  # in this branch but in the future relative to our current target.

  PLATFORM_VERSION_FUTURE_CODENAMES :=



  # Build a list of all untargeted code names. Avoid duplicates.

  _versions_not_in_target := \

    $(filter-out $(PLATFORM_VERSION_ALL_CODENAMES),$(ALL_VERSIONS))

  $(foreach version,$(_versions_not_in_target),\

    $(eval _codename := $(PLATFORM_VERSION_CODENAME.$(version)))\

    $(if $(filter $(_codename),$(PLATFORM_VERSION_FUTURE_CODENAMES)),,\

      $(eval PLATFORM_VERSION_FUTURE_CODENAMES += $(_codename))))



  # And convert from space separated to comma separated.

  PLATFORM_VERSION_ALL_CODENAMES := \

    $(subst $(space),$(comma),$(strip $(PLATFORM_VERSION_ALL_CODENAMES)))

  PLATFORM_VERSION_FUTURE_CODENAMES := \

    $(subst $(space),$(comma),$(strip $(PLATFORM_VERSION_FUTURE_CODENAMES)))



endif

.KATI_READONLY := \

  PLATFORM_VERSION_CODENAME \

  PLATFORM_VERSION_ALL_CODENAMES \

  PLATFORM_VERSION_FUTURE_CODENAMES

  PLATFORM_VERSION_ALL_CODENAMES



ifndef PLATFORM_VERSION

  ifeq (REL,$(PLATFORM_VERSION_CODENAME))