FIXUP fix shadow build with source and build dir on different Windows

Leave the paths in grd_reader.py alone. They will always be in the
source directory anyway, and the result will be compared to the list
of registered strings.

Change-Id: If72fd825cc37988e4e1af02800c41880d56c8525
Reviewed-by: Joerg Bornemann <[email protected]>

Author: Kai Koehne

chromium/tools/grit/grit/grd_reader.py

@@ -138,11 +138,6 @@ def ignorableWhitespace(self, whitespace):
     self.parent.ignorableWhitespace(whitespace)
 
 
-def maybeRelativePath(path, start):
-    if os.path.splitdrive(path)[0] == os.path.splitdrive(start)[0]:
-        return os.path.relpath(path, start)
-    return path
-
 def Parse(filename_or_stream, dir=None, stop_after=None, first_ids_file=None,
           debug=False, defines=None, tags_to_ignore=None, target_platform=None):
   '''Parses a GRD file into a tree of nodes (from grit.node).
@@ -212,7 +207,7 @@ def Parse(filename_or_stream, dir=None, stop_after=None, first_ids_file=None,
       GRIT_DIR_PREFIX = 'GRIT_DIR'
       if not (first_ids_file.startswith(GRIT_DIR_PREFIX)
           and first_ids_file[len(GRIT_DIR_PREFIX)] in ['/', '\\']):
-        rel_dir = maybeRelativePath(os.getcwd(), dir)
+        rel_dir = os.path.relpath(os.getcwd(), dir)
         first_ids_file = util.normpath(os.path.join(rel_dir, first_ids_file))
       handler.root.attrs['first_ids_file'] = first_ids_file
     # Assign first ids to the nodes that don't have them.