diff options
| author | newt@chromium.org <newt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-15 21:47:26 +0000 |
|---|---|---|
| committer | newt@chromium.org <newt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-15 21:47:26 +0000 |
| commit | 194c0cb0f607889ad8faed1069ef05ab57dd0aa9 (patch) | |
| tree | aac48580bca4acd791aa303be7fb56c7480c24b6 /remoting | |
| parent | 7e24ba495f0f003bce9f38477e1fe0eaab7b7c16 (diff) | |
| download | chromium_src-194c0cb0f607889ad8faed1069ef05ab57dd0aa9.zip chromium_src-194c0cb0f607889ad8faed1069ef05ab57dd0aa9.tar.gz chromium_src-194c0cb0f607889ad8faed1069ef05ab57dd0aa9.tar.bz2 | |
Roll grit 100:101
r101: Make grit build's -f flag relative to cwd.
This also updates remoting.gyp to the new usage of -f.
Review URL: https://chromiumcodereview.appspot.com/11906006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176978 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/remoting.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 2b6b1de..4b7c2dd 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -1772,7 +1772,7 @@ 'type': 'none', 'variables': { 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)', - 'grit_resource_ids': 'resource_ids', + 'grit_resource_ids': 'resources/resource_ids', 'sources': [ 'base/resources_unittest.cc', 'host/plugin/host_script_object.cc', |