platform/build/soong - Tiramisu is now 33
Bug: 225745567 Test: Build Change-Id: I647b3e979ea9df622d86784f84f1155759e9ac0e
This commit is contained in:
@@ -307,24 +307,25 @@ var finalCodenamesMapKey = NewOnceKey("FinalCodenamesMap")
|
||||
func getFinalCodenamesMap(config Config) map[string]int {
|
||||
return config.Once(finalCodenamesMapKey, func() interface{} {
|
||||
apiLevelsMap := 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,
|
||||
"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,
|
||||
}
|
||||
|
||||
// TODO: Differentiate "current" and "future".
|
||||
@@ -351,24 +352,25 @@ var apiLevelsMapKey = NewOnceKey("ApiLevelsMap")
|
||||
func GetApiLevelsMap(config Config) map[string]int {
|
||||
return config.Once(apiLevelsMapKey, func() interface{} {
|
||||
apiLevelsMap := 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,
|
||||
"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,
|
||||
}
|
||||
for i, codename := range config.PlatformVersionActiveCodenames() {
|
||||
apiLevelsMap[codename] = previewAPILevelBase + i
|
||||
|
Reference in New Issue
Block a user