summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-29 14:36:01 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-29 14:36:01 +0000
commit7ba052dadb465b596f42fd8cfd755d850649cda9 (patch)
tree1070a45a7af79209475ac2498326012dc49ecac2 /content/browser
parentf37efedcd408e4c0028357db8ad73b2a967810d6 (diff)
downloadchromium_src-7ba052dadb465b596f42fd8cfd755d850649cda9.zip
chromium_src-7ba052dadb465b596f42fd8cfd755d850649cda9.tar.gz
chromium_src-7ba052dadb465b596f42fd8cfd755d850649cda9.tar.bz2
Revert 129619 - Pick up and adjust to version of grit where default is no resource_ids file.
BUG=none Review URL: https://chromiumcodereview.appspot.com/9875019 TBR=joi@chromium.org Review URL: https://chromiumcodereview.appspot.com/9924007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129621 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/debugger/devtools_resources.gyp1
1 files changed, 0 insertions, 1 deletions
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)' ],