<tools/grit> GRIT: Allow grd files outside of chromium source dir.

When replacing substrings with values from a dictionary,
the replacements should not be truncated to the length of src_root_dir.

If the basename does not exist as a key in the resource_ids file,
then fall back to an absolute path.

The precedence is like:
file in chromium > file basename > absolute file name.

THIS SHOULD BE UPSTREAMABLE.

Change-Id: I7d1da8c04515807000742aac4a6fa4db7616fd13
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/chromium/tools/grit/grit/node/misc.py b/chromium/tools/grit/grit/node/misc.py
index d43f676f9b3..3816b2daa7b 100644
--- a/chromium/tools/grit/grit/node/misc.py
+++ b/chromium/tools/grit/grit/node/misc.py
@@ -60,6 +60,7 @@ def _ReadFirstIdsFromFile(filename, defines):
   def ReplaceVariable(matchobj):
     for key, value in defines.items():
       if matchobj.group(1) == key:
+        value = os.path.abspath(value)
         return value
     return ''
 
@@ -596,6 +597,11 @@ class GritNode(base.Node):
         abs_filename = os.path.abspath(filename_or_stream)
         if abs_filename[:len(src_root_dir)] != src_root_dir:
           filename = os.path.basename(filename_or_stream)
+          # If the file is not within src_root_dir and the basename is not
+          # found as a key, fall back to using the absolute file name.
+          if not filename in first_ids:
+            filename = abs_filename
+            filename = filename.replace('\\', '/')
         else:
           filename = abs_filename[len(src_root_dir) + 1:]
           filename = filename.replace('\\', '/')