From ebc0ea419431677da13f5d8086bffe32414ea180 Mon Sep 17 00:00:00 2001 From: Zoltan Arvai Date: Thu, 20 Feb 2014 17:20:57 +0100 Subject: GRIT should use unix file paths as dictionary keys on Windows GRIT uses filename strings as keys in its dictionary so generated filenames must be exactly the same strings as they are defined in .grd files. GRIT expects forward slashes as path separator and also .grd files are containing forward slashes. Similar conversion used in the else section of the outer if statement in the same function. Change-Id: I81bbf2e15e7aaefb52176405990d49457fce1589 Reviewed-by: Andras Becsi --- .../0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/patches/chromium/tools/grit/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch b/patches/chromium/tools/grit/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch index 9da214cc2..3a703b8ac 100644 --- a/patches/chromium/tools/grit/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch +++ b/patches/chromium/tools/grit/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch @@ -30,7 +30,7 @@ index 734c57a..33848b2 100755 return value return '' -@@ -427,6 +427,10 @@ class GritNode(base.Node): +@@ -427,6 +427,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) @@ -38,6 +38,7 @@ index 734c57a..33848b2 100755 + # 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('\\', '/') -- cgit v1.2.3