commit c5e321a06ec6e702c00dad2260df123d001ef72b
author James Wu <juu@google.com> Tue Aug 01 17:45:35 2023 +0000
committer James Wu <juu@google.com> Wed Aug 02 19:25:58 2023 +0000
tree 93eb6e34d797be912c509ff6bbc64b18b43f0c1f
parent 8cad379e98f0ae2e3dfb47181218211514370a33

Revise minSdkVersion to fix failed mainline_modules_bundles-userdebug

Test: abtd tests
Bug: 293456031
Change-Id: I674c50690bd04b7e4867c4aceb31d5bdcb53be84

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 64970d9..826ab1b 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -2429,8 +2429,9 @@
             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")