commit 285ce79db57a119e2e04e7bf00bbd71ff819ee37
author Remi NGUYEN VAN <reminv@google.com> Thu Mar 03 01:57:03 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 03 01:57:03 2022 +0000
tree 79b8bf3b055294482229b39f95fcb4e596db2cd2
parent 9688f00e3a7fcbcf523f6288affbaef85e69aee7
parent 979b652dec0c636bb8705e26cb3977efccc695c7

Merge "Support overriding APEX java contents" am: 979b652dec

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

Change-Id: Ic61f91405cdc67544468dd9431e2aad2cc1ad83b

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