Commit f7e75eee authored by Clark DuVall's avatar Clark DuVall Committed by Chromium LUCI CQ

Check <queries> tag from DFM manifest when doing manifest verification

This was causing a diff when enabling WebLayer in a split for WebView.

Bug: 1105096
Change-Id: I064cb23bb8630af26ed7692191182ebad335e16b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2617053Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841934}
parent e27f3991
......@@ -460,9 +460,15 @@ def _FixManifest(options, temp_dir, extra_manifest=None):
options.android_manifest)
if extra_manifest:
_, _, extra_app_nodes = manifest_utils.ParseManifest(extra_manifest)
for node in extra_app_nodes:
_, extra_manifest_node, extra_app_node = manifest_utils.ParseManifest(
extra_manifest)
for node in extra_app_node:
app_node.append(node)
for node in extra_manifest_node:
# DFM manifests have a bunch of tags we don't care about inside
# <manifest>, so only take <queries>.
if node.tag == 'queries':
manifest_node.append(node)
manifest_utils.AssertUsesSdk(manifest_node, options.min_sdk_version,
options.target_sdk_version)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment