summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-29 14:26:57 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-29 14:26:57 +0000
commit126630439ab30c9b3df17064b23500e438dbc854 (patch)
tree89fabbe7fec90967cfbff0e93912665e13b2e5b2 /content
parent47fac8c86f894552739dd4afac2c6b1a8e639d85 (diff)
downloadchromium_src-126630439ab30c9b3df17064b23500e438dbc854.zip
chromium_src-126630439ab30c9b3df17064b23500e438dbc854.tar.gz
chromium_src-126630439ab30c9b3df17064b23500e438dbc854.tar.bz2
Pick up and adjust to version of grit where default is no resource_ids file.
BUG=none Review URL: https://chromiumcodereview.appspot.com/9875019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/debugger/devtools_resources.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/content/browser/debugger/devtools_resources.gyp b/content/browser/debugger/devtools_resources.gyp
index bacacac..f29be19 100644
--- a/content/browser/debugger/devtools_resources.gyp
+++ b/content/browser/debugger/devtools_resources.gyp
@@ -35,6 +35,7 @@
],
'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)' ],