diff options
| author | 2024-04-23 22:50:41 +0000 | |
|---|---|---|
| committer | 2024-04-26 12:34:36 +0000 | |
| commit | c91d0cdc0fb70bdcb34ad858e95e3ef1462bd677 (patch) | |
| tree | f6d496150c7c47a50f0fd8f552be7cbaaaf56730 | |
| parent | bd5c92dfa90680a9c7c22bbf2e57bee5e61e7e34 (diff) | |
V is 35.
It's not bromine, it's not a gauge of film: it's the next Android
release.
Ignore-AOSP-First: VanillaIceCream Finalization
Bug: 335304236
Test: presubmit
Change-Id: Ie4e17236c85944e828edaf01dcdc782984dc0ad4
| -rw-r--r-- | android/api_levels.go | 41 | ||||
| -rw-r--r-- | java/droidstubs.go | 3 |
2 files changed, 23 insertions, 21 deletions
diff --git a/android/api_levels.go b/android/api_levels.go index fab5fc7bf..8f2ff1790 100644 --- a/android/api_levels.go +++ b/android/api_levels.go @@ -442,26 +442,27 @@ func GetApiLevelsJson(ctx PathContext) WritablePath { func getApiLevelsMapReleasedVersions() (map[string]int, error) { return map[string]int{ - "G": 9, - "I": 14, - "J": 16, - "J-MR1": 17, - "J-MR2": 18, - "K": 19, - "L": 21, - "L-MR1": 22, - "M": 23, - "N": 24, - "N-MR1": 25, - "O": 26, - "O-MR1": 27, - "P": 28, - "Q": 29, - "R": 30, - "S": 31, - "S-V2": 32, - "Tiramisu": 33, - "UpsideDownCake": 34, + "G": 9, + "I": 14, + "J": 16, + "J-MR1": 17, + "J-MR2": 18, + "K": 19, + "L": 21, + "L-MR1": 22, + "M": 23, + "N": 24, + "N-MR1": 25, + "O": 26, + "O-MR1": 27, + "P": 28, + "Q": 29, + "R": 30, + "S": 31, + "S-V2": 32, + "Tiramisu": 33, + "UpsideDownCake": 34, + "VanillaIceCream": 35, }, nil } diff --git a/java/droidstubs.go b/java/droidstubs.go index ffd3caf99..60af299a3 100644 --- a/java/droidstubs.go +++ b/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) } } |