Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Unified Diff: grit/node/misc.py

Issue 1320683002: Write sources from flattenhtml to depfiles. (Closed) Base URL: https://chromium.googlesource.com/external/grit-i18n.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | grit/node/misc_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: grit/node/misc.py
diff --git a/grit/node/misc.py b/grit/node/misc.py
index 7f450188fc75d48e73bb5d40b4e2e78c69d25b4e..1003b877548e243a4b8a8f9ddf9f3742c1aced04 100755
--- a/grit/node/misc.py
+++ b/grit/node/misc.py
@@ -333,9 +333,15 @@ class GritNode(base.Node):
structure.StructureNode, variant.SkeletonNode)):
input_path = node.GetInputPath()
if input_path is not None:
- input_files.add(input_path)
+ input_files.add(self.ToRealPath(input_path))
+
+ # If it's a flattened node, grab inlined resources too.
+ if node.name == 'structure' and node.attrs['flattenhtml'] == 'true':
+ node.RunPreSubstitutionGatherer()
+ input_files.update(node.GetHtmlResourceFilenames())
+
self.SetOutputLanguage(old_output_language)
- return sorted(map(self.ToRealPath, input_files))
+ return sorted(input_files)
def GetFirstIdsFile(self):
"""Returns a usable path to the first_ids file, if set, otherwise
« no previous file with comments | « no previous file | grit/node/misc_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698