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

Commit 8173aac9 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Add new make variables for extension SDK version" into sc-dev-plus-aosp... 

Merge "Add new make variables for extension SDK version" into sc-dev-plus-aosp am: 18d6ad50 am: 51a57784 am: 4c790761

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15684824

Change-Id: I6ab6a77264b40b726f72802bde8f1f3b819cac38
parents 51b105ca 4c790761

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
@@ -156,6 +156,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