diff options
| author | alk3pInjection <webmaster@raspii.tech> | 2022-01-20 22:04:36 +0800 |
|---|---|---|
| committer | alk3pInjection <webmaster@raspii.tech> | 2022-01-20 22:04:36 +0800 |
| commit | 886fd26ba9b1acbe4ea54a34e4add37e87663522 (patch) | |
| tree | 9e6de99949a31c9df4b6323926893762f7b92f24 | |
| parent | da1f221e82d6be508dd3a0bfd7cc79a46cbf6980 (diff) | |
| parent | 882344e37aaa50e861afbb40a103b4e020b1570a (diff) | |
Merge tag 'LA.QSSI.12.0.r1-05800-qssi.0' into sugisawa
"LA.QSSI.12.0.r1-05800-qssi.0"
Change-Id: I8db7edbf9044f1dcf78cf39859ac85900222be79
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/tasks/catbox.mk | 1 | ||||
| -rw-r--r-- | core/version_defaults.mk | 8 |
3 files changed, 6 insertions, 5 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index 5745d09457..9335afdf0e 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=SKQ1.211209.001 +BUILD_ID=SKQ1.211230.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 b547b3ca6a..cf3fce678c 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)) |