diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 10:43:22 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 10:43:22 +0000 |
| commit | 10692a62629f5fda3398fd7e768488d0711faddb (patch) | |
| tree | 9b6b4be9f198e0b054fd6dc2421bf619ad5c4ede | |
| parent | d670e70e583e3e43d497c758f972f32b12846d77 (diff) | |
| download | chromium_src-10692a62629f5fda3398fd7e768488d0711faddb.zip chromium_src-10692a62629f5fda3398fd7e768488d0711faddb.tar.gz chromium_src-10692a62629f5fda3398fd7e768488d0711faddb.tar.bz2 | |
Revert 129818 - Pick up and adjust to version of grit where default is no resource_ids file.
BUG=none
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=129619
Review URL: https://chromiumcodereview.appspot.com/9875019
TBR=joi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9959009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129823 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | build/grit_action.gypi | 1 | ||||
| -rw-r--r-- | content/browser/debugger/devtools_resources.gyp | 1 |
3 files changed, 1 insertions, 3 deletions
@@ -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)' ], |