Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994
Bug: 275386652 Merged-In: I4b2ea3956c34aa56cc6f54bab7148f116c34759e Change-Id: I900022a8e8f104b6dc52745211c428601be53ba6
This commit is contained in:
@@ -2391,12 +2391,22 @@ def GetMinSdkVersionInt(apk_name, codename_to_api_level_map):
|
||||
try:
|
||||
return int(version)
|
||||
except ValueError:
|
||||
# Not a decimal number. Codename?
|
||||
if version in codename_to_api_level_map:
|
||||
return codename_to_api_level_map[version]
|
||||
# Not a decimal number.
|
||||
#
|
||||
# It could be either a straight codename, e.g.
|
||||
# UpsideDownCake
|
||||
#
|
||||
# Or a codename with API fingerprint SHA, e.g.
|
||||
# UpsideDownCake.e7d3947f14eb9dc4fec25ff6c5f8563e
|
||||
#
|
||||
# Extract the codename and try and map it to a version number.
|
||||
split = version.split(".")
|
||||
codename = split[0]
|
||||
if codename in codename_to_api_level_map:
|
||||
return codename_to_api_level_map[codename]
|
||||
raise ExternalError(
|
||||
"Unknown minSdkVersion: '{}'. Known codenames: {}".format(
|
||||
version, codename_to_api_level_map))
|
||||
"Unknown codename: '{}' from minSdkVersion: '{}'. Known codenames: {}".format(
|
||||
codename, version, codename_to_api_level_map))
|
||||
|
||||
|
||||
def SignFile(input_name, output_name, key, password, min_api_level=None,
|
||||
|
Reference in New Issue
Block a user