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

Merge "Fix manifest_check.py for generated manifests that have no application tag" into main am: f27f020528

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

Change-Id: I3f75673603b96e8ce70e33b5aae84d39fc44eb50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-10-13 23:05:38 +00:00
committed by Automerger Merge Worker
parent 72fd3d4e86 f27f020528
commit cb96b84741
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/manifest_check.py
View File

@@ -187,18 +187,17 @@ def extract_uses_libs_apk(badging):
return required, optional, tags return required, optional, tags
def extract_uses_libs_xml(xml): #pylint: disable=inconsistent-return-statements def extract_uses_libs_xml(xml):
"""Extract <uses-library> tags from the manifest.""" """Extract <uses-library> tags from the manifest."""
manifest = parse_manifest(xml) manifest = parse_manifest(xml)
elems = get_children_with_tag(manifest, 'application') elems = get_children_with_tag(manifest, 'application')
application = elems[0] if len(elems) == 1 else None if len(elems) > 1:
if len(elems) > 1: #pylint: disable=no-else-raise
raise RuntimeError('found multiple <application> tags') raise RuntimeError('found multiple <application> tags')
elif not elems: if not elems:
if uses_libraries or optional_uses_libraries: #pylint: disable=undefined-variable return [], [], []
raise ManifestMismatchError('no <application> tag found')
return application = elems[0]
libs = get_children_with_tag(application, 'uses-library') libs = get_children_with_tag(application, 'uses-library')