diff options
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/tasks/catbox.mk | 1 | ||||
| -rw-r--r-- | core/version_defaults.mk | 10 |
3 files changed, 7 insertions, 6 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index ee82d45556..9c9a28a51a 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=SPM1.211109.001 +BUILD_ID=SPM1.211110.001 diff --git a/core/tasks/catbox.mk b/core/tasks/catbox.mk index 911c372ef9..443f4bbe95 100644 --- a/core/tasks/catbox.mk +++ b/core/tasks/catbox.mk @@ -15,6 +15,7 @@ test_suite_name := catbox test_suite_tradefed := catbox-tradefed test_suite_readme := test/catbox/tools/catbox-tradefed/README +test_suite_tools := $(HOST_OUT_JAVA_LIBRARIES)/catbox-report-lib.jar include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 4c83227778..f429d7c72c 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -39,9 +39,9 @@ ifdef INTERNAL_BUILD_ID_MAKEFILE include $(INTERNAL_BUILD_ID_MAKEFILE) endif -DEFAULT_PLATFORM_VERSION := SP1A -MIN_PLATFORM_VERSION := SP1A -MAX_PLATFORM_VERSION := SP1A +DEFAULT_PLATFORM_VERSION := SQ1A +MIN_PLATFORM_VERSION := SQ1A +MAX_PLATFORM_VERSION := SQ1A ALLOWED_VERSIONS := $(call allowed-platform-versions,\ $(MIN_PLATFORM_VERSION),\ @@ -93,7 +93,7 @@ PLATFORM_VERSION_LAST_STABLE := 12 # These are the current development codenames, if the build is not a final # release build. If this is a final release build, it is simply "REL". -PLATFORM_VERSION_CODENAME.SP1A := REL +PLATFORM_VERSION_CODENAME.SQ1A := REL ifndef PLATFORM_VERSION_CODENAME PLATFORM_VERSION_CODENAME := $(PLATFORM_VERSION_CODENAME.$(TARGET_PLATFORM_VERSION)) @@ -240,7 +240,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-11-05 + PLATFORM_SECURITY_PATCH := 2021-12-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH |