summaryrefslogtreecommitdiffstats
path: root/tools/grit/grit_info.py
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-03 20:02:38 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-03 20:02:38 +0000
commit210363ef5175e2d619d1aada3285bfa8c728fb04 (patch)
tree2ee8eab6500940fca83cfad71ecd6b6124f1ac74 /tools/grit/grit_info.py
parentcf09ad28048a124219839fdd321149d820f7e053 (diff)
downloadchromium_src-210363ef5175e2d619d1aada3285bfa8c728fb04.zip
chromium_src-210363ef5175e2d619d1aada3285bfa8c728fb04.tar.gz
chromium_src-210363ef5175e2d619d1aada3285bfa8c728fb04.tar.bz2
Include inlined files when computing grd inputs.
BUG=50804 Review URL: http://codereview.chromium.org/3074022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54800 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/grit/grit_info.py')
-rwxr-xr-xtools/grit/grit_info.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/grit/grit_info.py b/tools/grit/grit_info.py
index c036aa0..70c82eb 100755
--- a/tools/grit/grit_info.py
+++ b/tools/grit/grit_info.py
@@ -57,6 +57,9 @@ def Inputs(filename):
# Only include files that we actually plan on using.
if node.SatisfiesOutputCondition():
files.append(node.FilenameToOpen())
+ # If it's a flattened node, grab inlined resources too.
+ if node.attrs['flattenhtml'] == 'true':
+ files.extend(node.GetHtmlResourceFilenames())
# Add in the grit source files. If one of these change, we want to re-run
# grit.