diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-02 10:21:01 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-02 10:21:01 +0000 |
| commit | cc4814445109e4f2df529c81b549343040249810 (patch) | |
| tree | 5af50a862c239ed80ac85292b607fb80d1cbee85 | |
| parent | 9c8b54deb61e8d7445bf8889e60874cf60f86d5a (diff) | |
| download | chromium_src-cc4814445109e4f2df529c81b549343040249810.zip chromium_src-cc4814445109e4f2df529c81b549343040249810.tar.gz chromium_src-cc4814445109e4f2df529c81b549343040249810.tar.bz2 | |
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
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=129818
Review URL: https://chromiumcodereview.appspot.com/9875019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130115 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, 3 insertions, 1 deletions
@@ -116,7 +116,7 @@ deps = { (Var("googlecode_url") % "snappy") + "/trunk@37", "src/tools/grit": - (Var("googlecode_url") % "grit-i18n") + "/trunk@18", + (Var("googlecode_url") % "grit-i18n") + "/trunk@23", "src/tools/gyp": (Var("googlecode_url") % "gyp") + "/trunk@1293", diff --git a/build/grit_action.gypi b/build/grit_action.gypi index 60a2320..9d078b4 100644 --- a/build/grit_action.gypi +++ b/build/grit_action.gypi @@ -25,6 +25,7 @@ ], '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 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)' ], |