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 am: 240c63fba3 am: 73214a06a4

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21337794

Change-Id: Id6eb919c5014dd79b894f3ff87c348490eab463b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-02-11 03:44:44 +00:00
committed by Automerger Merge Worker
parent 17249acd7d 73214a06a4
commit 7b9f430cec
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:
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,