diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2023-02-11 02:21:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-02-11 02:21:48 +0000 |
| commit | 240c63fba3d5f34b37cfea5b1a29a5ee466985c8 (patch) | |
| tree | 7f8cc1b71bb5df61fdfc46220ea0abe09009ed75 | |
| parent | 2b6ea18ce15cb8efa151e664d2976458cac28962 (diff) | |
| parent | a03f1265fba2756ae0d134cd7833ac7a32b8f8ea (diff) | |
| download | build-240c63fba3d5f34b37cfea5b1a29a5ee466985c8.tar.gz | |
Merge "Support SHA minSdkVersion in APK in APEX" into tm-dev
| -rw-r--r-- | tools/releasetools/common.py | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 418d8daa85..ec49b0d36f 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -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, |