summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--build/grit_action.gypi1
-rw-r--r--content/browser/debugger/devtools_resources.gyp1
3 files changed, 1 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index 44c9752..905e94a 100644
--- a/DEPS
+++ b/DEPS
@@ -116,7 +116,7 @@ deps = {
(Var("googlecode_url") % "snappy") + "/trunk@37",
"src/tools/grit":
- (Var("googlecode_url") % "grit-i18n") + "/trunk@19",
+ (Var("googlecode_url") % "grit-i18n") + "/trunk@18",
"src/tools/gyp":
(Var("googlecode_url") % "gyp") + "/trunk@1282",
diff --git a/build/grit_action.gypi b/build/grit_action.gypi
index 9d078b4..60a2320 100644
--- a/build/grit_action.gypi
+++ b/build/grit_action.gypi
@@ -25,7 +25,6 @@
],
'action': ['<@(grit_cmd)',
'-i', '<(grit_grd_file)', 'build',
- '-f', 'GRIT_DIR/../gritsettings/resource_ids',
'-o', '<(grit_out_dir)',
'<@(grit_defines)' ],
'message': 'Generating resources from <(grit_grd_file)',
diff --git a/content/browser/debugger/devtools_resources.gyp b/content/browser/debugger/devtools_resources.gyp
index f29be19..bacacac 100644
--- a/content/browser/debugger/devtools_resources.gyp
+++ b/content/browser/debugger/devtools_resources.gyp
@@ -35,7 +35,6 @@
],
'action': ['<@(grit_cmd)',
'-i', '<(grit_grd_file)', 'build',
- '-f', 'GRIT_DIR/../gritsettings/resource_ids',
'-o', '<(grit_out_dir)',
'-D', 'SHARED_INTERMEDIATE_DIR=<(SHARED_INTERMEDIATE_DIR)',
'<@(grit_defines)' ],