StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "V is 35." into main

Browse Source
This commit is contained in:
Michael Wright
2024-04-26 15:18:57 +00:00
committed by Android (Google) Code Review
parent 222cf29c55 c91d0cdc0f
commit 0b267bee67
2 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
android/api_levels.go
View File

@@ -442,26 +442,27 @@ func GetApiLevelsJson(ctx PathContext) WritablePath {
func getApiLevelsMapReleasedVersions() (map[string]int, error) { func getApiLevelsMapReleasedVersions() (map[string]int, error) {
return map[string]int{ return map[string]int{
"G": 9, "G": 9,
"I": 14, "I": 14,
"J": 16, "J": 16,
"J-MR1": 17, "J-MR1": 17,
"J-MR2": 18, "J-MR2": 18,
"K": 19, "K": 19,
"L": 21, "L": 21,
"L-MR1": 22, "L-MR1": 22,
"M": 23, "M": 23,
"N": 24, "N": 24,
"N-MR1": 25, "N-MR1": 25,
"O": 26, "O": 26,
"O-MR1": 27, "O-MR1": 27,
"P": 28, "P": 28,
"Q": 29, "Q": 29,
"R": 30, "R": 30,
"S": 31, "S": 31,
"S-V2": 32, "S-V2": 32,
"Tiramisu": 33, "Tiramisu": 33,
"UpsideDownCake": 34, "UpsideDownCake": 34,
"VanillaIceCream": 35,
}, nil }, nil
} }

3
java/droidstubs.go
View File

@@ -599,7 +599,8 @@ func (d *Droidstubs) apiLevelsAnnotationsFlags(ctx android.ModuleContext, cmd *a
} }
if apiVersions != nil { if apiVersions != nil {
cmd.FlagWithArg("--current-version ", ctx.Config().PlatformSdkVersion().String()) 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) cmd.FlagWithInput("--apply-api-levels ", apiVersions)
} }
} }