StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add new make variables for extension SDK version" into sc-dev-plus-aosp am: 18d6ad50c4 am: 51a5778483

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

Change-Id: I65657f444b8ce92c548695a089147042a2631faa
This commit is contained in:
Anton Hansson
2021-08-31 11:10:51 +00:00
committed by Automerger Merge Worker
parent 6a3850215a 51a5778483
commit 4c790761e7
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/soong_config.mk
View File

@@ -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_val, Platform_sdk_version, $(PLATFORM_SDK_VERSION))
$(call add_json_str, Platform_sdk_codename, $(PLATFORM_VERSION_CODENAME)) $(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_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_csv, Platform_version_active_codenames, $(PLATFORM_VERSION_ALL_CODENAMES))
$(call add_json_str, Platform_security_patch, $(PLATFORM_SECURITY_PATCH)) $(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_preview_sdk_version, $(PLATFORM_PREVIEW_SDK_VERSION))

6
core/version_defaults.mk
View File

@@ -156,6 +156,12 @@ ifndef PLATFORM_SDK_VERSION
endif endif
.KATI_READONLY := PLATFORM_SDK_VERSION .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)) ifeq (REL,$(PLATFORM_VERSION_CODENAME))
PLATFORM_PREVIEW_SDK_VERSION := 0 PLATFORM_PREVIEW_SDK_VERSION := 0
else else