commit 4d9e6e667ac9e977864f229d043e595cf690441b
author Liz Kammer <eakammer@google.com> Fri Feb 04 15:06:03 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 04 15:06:03 2022 +0000
tree 48d2392dc81039dd7ee1c054e7a2123fa5cb1341
parent b490967af09664ee9cdb4079bd8f96a3d758dcb9
parent 56df1b8a9bc0b6571e32e652338aababbaca6d83

Merge "Allowlist additional com.android.runtime blockers" am: cc1a2062f0 am: a26a05e7cd am: 56df1b8a9b

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1965179

Change-Id: I90b54cec510deffdc952d51fcfe5c7ed1b6cff10

android/api_levels.go

diff --git a/android/api_levels.go b/android/api_levels.go
index 926d297..de56625 100644
--- a/android/api_levels.go
+++ b/android/api_levels.go
@@ -321,6 +321,7 @@
 			"Q":     29,
 			"R":     30,
 			"S":     31,
+			"S-V2":  32,
 		}
 
 		// TODO: Differentiate "current" and "future".
@@ -364,6 +365,7 @@
 			"Q":     29,
 			"R":     30,
 			"S":     31,
+			"S-V2":  32,
 		}
 		for i, codename := range config.PlatformVersionActiveCodenames() {
 			apiLevelsMap[codename] = previewAPILevelBase + i