commit 6e5d419d34402620e4b1f51a8c0204bdabe56461
author Nicolas Geoffray <ngeoffray@google.com> Thu Feb 10 14:55:14 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 10 14:55:14 2022 +0000
tree b17de6d3bc361b28b7f76790f841ff7dc79fbe0f
parent 1f64a8cbbab2d9bf97f99930cdfaa9e1d4c8460f
parent 61bbe44e533535241cf210256de07f3bb2430461

Merge "Revert "Switch to clang-r445002"" am: 2b2d9392fc am: 9bd52c7f71 am: 61bbe44e53

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

Change-Id: I543c1e982a4e1df7311b24d2e381606dedaafbc3

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