Merge "Don't fail the build if manifest_check cannot extract targetSdkVersion." am: 23e574fcc4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655687 Change-Id: I0aecbd0d96baf3aca3dde43f547aa65e055a1f20
This commit is contained in:
committed by
Automerger Merge Worker
commit
cd6c6ecf3c
@@ -289,7 +289,12 @@ def main():
|
|||||||
f.write("%s\n" % errmsg)
|
f.write("%s\n" % errmsg)
|
||||||
|
|
||||||
if args.extract_target_sdk_version:
|
if args.extract_target_sdk_version:
|
||||||
print(extract_target_sdk_version(manifest, is_apk))
|
try:
|
||||||
|
print(extract_target_sdk_version(manifest, is_apk))
|
||||||
|
except:
|
||||||
|
# Failed; don't crash, return "any" SDK version. This will result in
|
||||||
|
# dexpreopt not adding any compatibility libraries.
|
||||||
|
print(10000)
|
||||||
|
|
||||||
if args.output:
|
if args.output:
|
||||||
# XML output is supposed to be written only when this script is invoked
|
# XML output is supposed to be written only when this script is invoked
|
||||||
|
Reference in New Issue
Block a user