Commit e1608a4f authored by thestig's avatar thestig Committed by Commit bot

Fix a couple small problems with tools/unused-grit-header.py.

- Checking the wrong nodes due to a typo in the previous code review.
- Handle the case of GRD files that do not emit a header file.

NOTRY=true

Review URL: https://codereview.chromium.org/510623002

Cr-Commit-Position: refs/heads/master@{#292062}
parent df30065a
...@@ -78,12 +78,12 @@ def GetResourcesForGrdFile(tree, grd_file): ...@@ -78,12 +78,12 @@ def GetResourcesForGrdFile(tree, grd_file):
release_node = FindNodeWithTag(root, 'release') release_node = FindNodeWithTag(root, 'release')
assert release_node != None assert release_node != None
messages_node = FindNodeWithTag(root, 'messages') messages_node = FindNodeWithTag(release_node, 'messages')
messages = set() messages = set()
if messages_node != None: if messages_node != None:
messages = set(GetResourcesForNode(messages_node, grd_file, 'message')) messages = set(GetResourcesForNode(messages_node, grd_file, 'message'))
includes_node = FindNodeWithTag(root, 'includes') includes_node = FindNodeWithTag(release_node, 'includes')
includes = set() includes = set()
if includes_node != None: if includes_node != None:
includes = set(GetResourcesForNode(includes_node, grd_file, 'include')) includes = set(GetResourcesForNode(includes_node, grd_file, 'include'))
...@@ -180,6 +180,9 @@ def main(argv): ...@@ -180,6 +180,9 @@ def main(argv):
tree = xml.etree.ElementTree.parse(grd_file) tree = xml.etree.ElementTree.parse(grd_file)
grit_header = GetOutputHeaderFile(tree) grit_header = GetOutputHeaderFile(tree)
if not grit_header:
print 'Error: %s does not generate any output headers.' % grit_header
return 1
resources = GetResourcesForGrdFile(tree, grd_file) resources = GetResourcesForGrdFile(tree, grd_file)
files_with_unneeded_grit_includes = [] files_with_unneeded_grit_includes = []
......
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