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

Merge "Simplify logic in Soong ApiLevelFromUserWithConfig"

Browse Source
This commit is contained in:
Alix Espino
2023-04-03 13:41:02 +00:00
committed by Gerrit Code Review
parent 1c102d34b7 fb502512cb
commit 2173e6545a
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
android/api_levels.go
View File

@@ -344,14 +344,17 @@ func ApiLevelFromUserWithConfig(config Config, raw string) (ApiLevel, error) {
} }
} }
canonical := ReplaceFinalizedCodenames(config, raw) canonical, ok := getApiLevelsMapReleasedVersions()[raw]
asInt, err := strconv.Atoi(canonical) if !ok {
if err != nil { asInt, err := strconv.Atoi(raw)
return NoneApiLevel, fmt.Errorf("%q could not be parsed as an integer and is not a recognized codename", canonical) if err != nil {
return NoneApiLevel, fmt.Errorf("%q could not be parsed as an integer and is not a recognized codename", raw)
}
return uncheckedFinalApiLevel(asInt), nil
} }
apiLevel := uncheckedFinalApiLevel(asInt) return uncheckedFinalApiLevel(canonical), nil
return apiLevel, nil
} }
// ApiLevelForTest returns an ApiLevel constructed from the supplied raw string. // ApiLevelForTest returns an ApiLevel constructed from the supplied raw string.