diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-22 21:32:29 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-22 21:32:29 +0000 |
| commit | bd1ae7f270f3ada8b0a4c14073153e1240d26bff (patch) | |
| tree | 461a16331f516b236775d02795d51c3ba814e334 /chrome/chrome.gyp | |
| parent | f211055157a3a0e83018ed7dc6b3a9e18480f1ec (diff) | |
| download | chromium_src-bd1ae7f270f3ada8b0a4c14073153e1240d26bff.zip chromium_src-bd1ae7f270f3ada8b0a4c14073153e1240d26bff.tar.gz chromium_src-bd1ae7f270f3ada8b0a4c14073153e1240d26bff.tar.bz2 | |
Load devtools files from resources.pak rather than from disk take 2.
This change merges devtools_resources.pak into resources.pak and
puts the code to load files from disk behind a command line switch.
If --debug-devtools is passed on the command line, we enable the code
to load from disk (so the developer can make changes to the .js
files without having to recompile or restart the browser).
I also tried to make sure we no longer include the resources directory
in release packages, but I probably missed something.
This time, make sure to include the devtools_resources.pak in
Chromium.app on OSX.
BUG=35793
TBR=pfeldman
Review URL: http://codereview.chromium.org/6708093
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 0471d6e..51611b3 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1325,6 +1325,7 @@ 'variables': { 'pak_inputs': [ '<(grit_out_dir)/component_extension_resources.pak', + '<(grit_out_dir)/devtools_resources.pak', '<(grit_out_dir)/net_internals_resources.pak', '<(grit_out_dir)/shared_resources.pak', '<(grit_out_dir)/sync_internals_resources.pak', |