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

Commit d55863f3 authored by Jason Wu's avatar Jason Wu Committed by Automerger Merge Worker
Browse files

Merge "Revise minSdkVersion to fix failed mainline_modules_bundles-userdebug"... 

Merge "Revise minSdkVersion to fix failed mainline_modules_bundles-userdebug" into main am: 8e1baff3 am: c28a6572 am: c8669769 am: 6e021804

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



Change-Id: I62b1703a0fdf83b23d6dfa7b00354ee851f2d1e3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents db0e8170 6e021804

tools/releasetools/common.py

+3 −2
Original line number Diff line number Diff line
@@ -2429,8 +2429,9 @@ def GetMinSdkVersion(apk_name): 
            apk_name, proc.returncode, stdoutdata, stderrdata))



  for line in stdoutdata.split("\n"):

    # Looking for lines such as sdkVersion:'23' or sdkVersion:'M'.

    m = re.match(r'sdkVersion:\'([^\']*)\'', line)

    # Due to ag/24161708, looking for lines such as minSdkVersion:'23',minSdkVersion:'M'

    # or sdkVersion:'23', sdkVersion:'M'.

    m = re.match(r'(?:minSdkVersion|sdkVersion):\'([^\']*)\'', line)

    if m:

      return m.group(1)

  raise ExternalError("No minSdkVersion returned by aapt2")