| commit | e61fa41f0d1df2c1c78e4b63e8c05c4f23fdd95c | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 08:29:30 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 08:29:30 2021 +0000 |
| tree | fa6cbcbd0612565b79223783be43ac850a6d51df | |
| parent | e234e6c32001c7a2e6a1de8bba1441fe55616d6d [diff] | |
| parent | 625ebd3f7abf7e6c5ff29e34c4f5acaf681f6a0c [diff] |
[automerger skipped] Merge "Merge Android 12" am: b9b28016e6 -s ours am: 9a82d5d3f3 -s ours am: ef79b326ef -s ours am: 625ebd3f7a -s ours am skip reason: Merged-In I92a002aa926d8d48637e35b26c41ef65026e8eed with SHA-1 ab1d0dc36e is already in history Original change: https://android-review.googlesource.com/c/platform/build/+/1847373 Change-Id: I54f1fdea1094a9adaf0c39216427283d1e2135d1
diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 8432513..2b63a3e 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk
@@ -52,6 +52,7 @@ # 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.SP2A := Sv2 PLATFORM_VERSION_CODENAME.TP1A := Tiramisu ifndef PLATFORM_SDK_VERSION