commit c85877030d629f21b52dfdfc26aa859d89e28f5b
author Pedro Loureiro <pedroql@google.com> Fri Jan 28 10:31:45 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 28 10:31:45 2022 +0000
tree 6b74ea7c05ebce1abc9680ffd21b9124b466cc05
parent 2874806c79d50cd4adc3ebb88c2ff36b712d402c
parent b30ad5c950361fc051326b2c86e07bbac5ad99b0

Merge "Add special case for test-only module in configuredJars method" am: e4c255cb04 am: f4ddb097e5 am: b30ad5c950

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

Change-Id: I734f9f3d0c9265b54335ed306e0b79ff808880da

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