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

Merge "Support SHA minSdkVersion in APK in APEX" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-02-11 02:21:48 +00:00
committed by Android (Google) Code Review
parent 2b6ea18ce1 a03f1265fb
commit 240c63fba3
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/releasetools/common.py
View File

@@ -2309,12 +2309,22 @@ def GetMinSdkVersionInt(apk_name, codename_to_api_level_map):
try: try:
return int(version) return int(version)
except ValueError: except ValueError:
# Not a decimal number. Codename? # Not a decimal number.
if version in codename_to_api_level_map: #
return codename_to_api_level_map[version] # 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( raise ExternalError(
"Unknown minSdkVersion: '{}'. Known codenames: {}".format( "Unknown codename: '{}' from minSdkVersion: '{}'. Known codenames: {}".format(
version, codename_to_api_level_map)) codename, version, codename_to_api_level_map))
def SignFile(input_name, output_name, key, password, min_api_level=None, def SignFile(input_name, output_name, key, password, min_api_level=None,