From c5e321a06ec6e702c00dad2260df123d001ef72b Mon Sep 17 00:00:00 2001 From: James Wu Date: Tue, 1 Aug 2023 17:45:35 +0000 Subject: [PATCH] Revise minSdkVersion to fix failed mainline_modules_bundles-userdebug Test: abtd tests Bug: 293456031 Change-Id: I674c50690bd04b7e4867c4aceb31d5bdcb53be84 --- tools/releasetools/common.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 64970d96b0..826ab1bf80 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -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")