Properly substitute variables that reference paths outside SRCDIR.

grit/node/misc.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Miscellaneous node types.
 """
 
 import os.path
 import re
@@ skipping 31 matching lines @@
   Returns a tuple, the absolute path of SRCDIR followed by the
   first_ids dictionary.
   """
   first_ids_dict = eval(util.ReadFile(filename, util.RAW_TEXT))
   src_root_dir = os.path.abspath(os.path.join(os.path.dirname(filename),
                                               first_ids_dict['SRCDIR']))
 
   def ReplaceVariable(matchobj):
     for key, value in defines.iteritems():
       if matchobj.group(1) == key:
-        value = os.path.abspath(value)[len(src_root_dir) + 1:]
         return value
     return ''
 
   renames = []
   for grd_filename in first_ids_dict:
     new_grd_filename = re.sub(r'<\(([A-Za-z_]+)\)', ReplaceVariable,
                               grd_filename)
     if new_grd_filename != grd_filename:
-      new_grd_filename = new_grd_filename.replace('\\', '/')
+      abs_grd_filename = os.path.abspath(new_grd_filename)
+      if abs_grd_filename[:len(src_root_dir)] != src_root_dir:
+        new_grd_filename = os.path.basename(abs_grd_filename)
+      else:
+        new_grd_filename = abs_grd_filename[len(src_root_dir) + 1:]
+        new_grd_filename = new_grd_filename.replace('\\', '/')
       renames.append((grd_filename, new_grd_filename))
 
   for grd_filename, new_grd_filename in renames:
     first_ids_dict[new_grd_filename] = first_ids_dict[grd_filename]
     del(first_ids_dict[grd_filename])
 
   return (src_root_dir, first_ids_dict)
 
 
 class SplicingNode(base.Node):
@@ skipping 438 matching lines @@
     by parameters of the same name.
     """
     node = IdentifierNode()
     node.StartParsing('identifier', parent)
     node.HandleAttribute('name', name)
     node.HandleAttribute('id', id)
     node.HandleAttribute('comment', comment)
     node.HandleAttribute('systemid', systemid)
     node.EndParsing()
     return node