Merge "V is 35." into main

android/api_levels.go

@@ -462,6 +462,7 @@ func getApiLevelsMapReleasedVersions() (map[string]int, error) {
 		"S-V2":            32,
 		"Tiramisu":        33,
 		"UpsideDownCake":  34,
+		"VanillaIceCream": 35,
 	}, nil
 }
 

java/droidstubs.go

@@ -599,7 +599,8 @@ func (d *Droidstubs) apiLevelsAnnotationsFlags(ctx android.ModuleContext, cmd *a
 	}
 	if apiVersions != nil {
 		cmd.FlagWithArg("--current-version ", ctx.Config().PlatformSdkVersion().String())
-		cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename())
+		// STOPSHIP: RESTORE THIS LOGIC WHEN DECLARING "REL" BUILD
+		// cmd.FlagWithArg("--current-codename ", ctx.Config().PlatformSdkCodename())
 		cmd.FlagWithInput("--apply-api-levels ", apiVersions)
 	}
 }