diff options
| -rw-r--r-- | core/soong_config.mk | 1 | ||||
| -rw-r--r-- | core/version_defaults.mk | 21 |
2 files changed, 3 insertions, 19 deletions
diff --git a/core/soong_config.mk b/core/soong_config.mk index c91639c015..cbc2dd1f4d 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -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)) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 811bcd85be..fe71d7b4fd 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -123,8 +123,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 @@ -141,29 +141,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 ifeq (REL,$(PLATFORM_VERSION_CODENAME)) PLATFORM_PREVIEW_SDK_VERSION := 0 |