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

Commit 249bc4c0 authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge changes from topic "fix-api_levels.json" 

* changes:
  Separate active codenames and preview codenames.
  Acknowledge V in AOSP.
parents d67a345f 4d24cbd0

core/soong_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ $(call add_json_bool, Platform_sdk_final, $(filter REL,$(PLATFORM 
$(call add_json_val,  Platform_sdk_extension_version,    $(PLATFORM_SDK_EXTENSION_VERSION))

$(call add_json_val,  Platform_base_sdk_extension_version, $(PLATFORM_BASE_SDK_EXTENSION_VERSION))

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

$(call add_json_csv,  Platform_version_all_preview_codenames, $(PLATFORM_VERSION_ALL_PREVIEW_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

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ endif 
DEFAULT_PLATFORM_VERSION := UP1A

.KATI_READONLY := DEFAULT_PLATFORM_VERSION

MIN_PLATFORM_VERSION := UP1A

MAX_PLATFORM_VERSION := UP1A

MAX_PLATFORM_VERSION := VP1A



# The last stable version name of the platform that was released.  During

# development, this stays at that previous version, while the codename indicates
@@ -54,6 +54,7 @@ PLATFORM_VERSION_LAST_STABLE := 13 
# These are the current development codenames, if the build is not a final

# release build.  If this is a final release build, it is simply "REL".

PLATFORM_VERSION_CODENAME.UP1A := UpsideDownCake

PLATFORM_VERSION_CODENAME.VP1A := VanillaIceCream



# This is the user-visible version.  In a final release build it should

# be empty to use PLATFORM_VERSION as the user-visible version.  For

core/version_util.mk

+16 −1
Original line number Diff line number Diff line
@@ -80,13 +80,28 @@ $(foreach version,$(_versions_in_target),\ 
  $(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

# ALL_CODENAMES variable is sort of a lie for historical reasons and only

# includes codenames up to and including the currently active codename, whereas

# this variable also includes future codenames. For example, while AOSP is still

# merging into U, but V development has started, ALL_CODENAMES will only be U,

# but ALL_PREVIEW_CODENAMES will be U and V.

PLATFORM_VERSION_ALL_PREVIEW_CODENAMES :=

$(foreach version,$(ALL_VERSIONS),\

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

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

    $(eval PLATFORM_VERSION_ALL_PREVIEW_CODENAMES += $(_codename))))



# And convert from space separated to comma separated.

PLATFORM_VERSION_ALL_CODENAMES := \

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

PLATFORM_VERSION_ALL_PREVIEW_CODENAMES := \

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



.KATI_READONLY := \

  PLATFORM_VERSION_CODENAME \

  PLATFORM_VERSION_ALL_CODENAMES

  PLATFORM_VERSION_ALL_CODENAMES \

  PLATFORM_VERSION_ALL_PREVIEW_CODENAMES \



ifneq (REL,$(PLATFORM_VERSION_CODENAME))

  codenames := \