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

Commit f330c725 authored by Anton Hansson's avatar Anton Hansson Committed by Android (Google) Code Review
Browse files

Merge "Add new make variables for extension SDK version" into stage-aosp-master

parents 6545f983 9b8082c2

core/soong_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ $(call add_json_str, Platform_version_name, $(PLATFORM_VERSION)) 
$(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_val,  Platform_sdk_extension_version,    $(PLATFORM_SDK_EXTENSION_VERSION))

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

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

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

core/version_defaults.mk

+6 −0
Original line number Diff line number Diff line
@@ -155,6 +155,12 @@ ifndef PLATFORM_SDK_VERSION 
endif

.KATI_READONLY := PLATFORM_SDK_VERSION



# This is the sdk extension version of this tree.

PLATFORM_SDK_EXTENSION_VERSION :=$= 1



# This is the sdk extension version that PLATFORM_SDK_VERSION ships with.

PLATFORM_BASE_SDK_EXTENSION_VERSION :=$= 0



ifeq (REL,$(PLATFORM_VERSION_CODENAME))

  PLATFORM_PREVIEW_SDK_VERSION := 0

else