StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revise minSdkVersion to fix failed mainline_modules_bundles-userdebug" into main am: 8e1baff3d3 am: c28a6572ae

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

Change-Id: I17ba7bbefac31ac577d7d5b11d706565df5f54d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jason Wu
2023-08-02 22:41:57 +00:00
committed by Automerger Merge Worker
parent f9726a7428 c28a6572ae
commit c866976999
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/releasetools/common.py
View File

@@ -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")