Commit a4c59f93 authored by Sam Maier's avatar Sam Maier Committed by Commit Bot

Ignoring raw resources in HardcodeSharedLibraryDynamicAttributes

ParseFromString will fail if given a raw resource since it expects a
compiled xml file.

Change-Id: I2a92b3cd48e8cfc1eb402106689f3596fe960e73
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2375901
Auto-Submit: Sam Maier <smaier@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801547}
parent 794181ed
......@@ -201,7 +201,7 @@ def HardcodeSharedLibraryDynamicAttributes(zip_path,
table.ParseFromString(data)
_HardcodeInTable(table, is_bundle_module, shared_resources_allowlist)
data = table.SerializeToString()
elif filename.endswith('.xml'):
elif filename.endswith('.xml') and not filename.startswith('res/raw'):
xml_node = Resources_pb2.XmlNode()
xml_node.ParseFromString(data)
_ProcessProtoXmlNode(xml_node)
......
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