diff options
| author | Anton Hansson <hansson@google.com> | 2021-09-01 09:00:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-09-01 09:00:15 +0000 |
| commit | 0d201ba42645fd53aa542bb3f7e65e64ae1c9bf4 (patch) | |
| tree | fbd68ab8c994de0e558077af32a033a49551c25a | |
| parent | bdf9be4708f75624fccc26495346c030ccaa0576 (diff) | |
| parent | 2df8730d951be27a8ccf072db609d4437d65c8eb (diff) | |
| download | build-0d201ba42645fd53aa542bb3f7e65e64ae1c9bf4.tar.gz | |
Merge "Add new make variables for extension SDK version"
| -rw-r--r-- | core/soong_config.mk | 1 | ||||
| -rw-r--r-- | core/version_defaults.mk | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/core/soong_config.mk b/core/soong_config.mk index 6ed2f200a4..a39707edb8 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -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)) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 530bbffa3f..a358005033 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -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 :=$= 0 + +# 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 |