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

Merge "Revert^2 "Fix signing failure for split APKs"" into main am: 7575d3f967 am: 5dbc1b979b

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

Change-Id: I73b986872e3a1b41b270c7fa6ecc683ead97bd6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yurii Zubrytskyi
2024-08-01 16:38:51 +00:00
committed by Automerger Merge Worker
parent 2f6d49807b 5dbc1b979b
commit 57d04ed9b7
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/releasetools/common.py
View File

@@ -2434,12 +2434,23 @@ def GetMinSdkVersion(apk_name):
"Failed to obtain minSdkVersion for {}: aapt2 return code {}:\n{}\n{}".format( "Failed to obtain minSdkVersion for {}: aapt2 return code {}:\n{}\n{}".format(
apk_name, proc.returncode, stdoutdata, stderrdata)) apk_name, proc.returncode, stdoutdata, stderrdata))
is_split_apk = False
for line in stdoutdata.split("\n"): for line in stdoutdata.split("\n"):
# See b/353837347 , split APKs do not have sdk version defined,
# so we default to 21 as split APKs are only supported since SDK
# 21.
if (re.search(r"split=[\"'].*[\"']", line)):
is_split_apk = True
# Due to ag/24161708, looking for lines such as minSdkVersion:'23',minSdkVersion:'M' # Due to ag/24161708, looking for lines such as minSdkVersion:'23',minSdkVersion:'M'
# or sdkVersion:'23', sdkVersion:'M'. # or sdkVersion:'23', sdkVersion:'M'.
m = re.match(r'(?:minSdkVersion|sdkVersion):\'([^\']*)\'', line) m = re.match(r'(?:minSdkVersion|sdkVersion):\'([^\']*)\'', line)
if m: if m:
return m.group(1) return m.group(1)
if is_split_apk:
logger.info("%s is a split APK, it does not have minimum SDK version"
" defined. Defaulting to 21 because split APK isn't supported"
" before that.", apk_name)
return 21
raise ExternalError("No minSdkVersion returned by aapt2 for apk: {}".format(apk_name)) raise ExternalError("No minSdkVersion returned by aapt2 for apk: {}".format(apk_name))