diff options
author | Colin Cross <ccross@android.com> | 2021-09-29 16:59:52 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-09-29 16:59:52 +0000 |
commit | 2b595c26d14e3f408f71efbcf67741c86f3b04b2 (patch) | |
tree | 60dd686f1f8d1269a7b152cb9e418ca07f3ee547 | |
parent | 98c2172cb8068f02e8432ab5210fb80895d257ed (diff) | |
parent | 177cbf600d215e34b356b86d8d12a917a9cd4c31 (diff) | |
download | build-2b595c26d14e3f408f71efbcf67741c86f3b04b2.tar.gz |
Merge "Update build_id.mk and version_defaults.mk for SC QPR1" into sc-qpr1-dev
-rw-r--r-- | core/build_id.mk | 2 | ||||
-rw-r--r-- | core/version_defaults.mk | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index 84429d27d3..025970bfbb 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=SC_QPR1 diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 4c83227778..c864bb098e 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)) |