diff options
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/soong_config.mk | 1 | ||||
| -rw-r--r-- | core/version_defaults.mk | 8 |
3 files changed, 9 insertions, 2 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index 84429d27d3..2f9c3f3bf1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=SC +BUILD_ID=MASTER diff --git a/core/soong_config.mk b/core/soong_config.mk index 66cd47edfc..e0fd9becc3 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 663579ac11..b4329f7ebe 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -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 @@ -240,7 +246,7 @@ ifndef PLATFORM_SECURITY_PATCH # It must be of the form "YYYY-MM-DD" on production devices. # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2021-09-05 + PLATFORM_SECURITY_PATCH := 2021-10-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH |