Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b9f430c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Support SHA minSdkVersion in APK in APEX" into tm-dev am: 240c63fb am: 73214a06 

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



Change-Id: Id6eb919c5014dd79b894f3ff87c348490eab463b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 17249acd 73214a06

tools/releasetools/common.py

+15 −5
Original line number Diff line number Diff line
@@ -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,