summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-22 00:31:38 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-22 00:31:38 +0000
commit0d4e6553190cfa98cbc29ef6aec82185fc50d993 (patch)
tree248ca7ab102c972e6aa81ef12b3c27253f76ce64 /chrome/chrome.gyp
parent3cb642967a61a3d46b226fb4ce39e69086dde2c6 (diff)
downloadchromium_src-0d4e6553190cfa98cbc29ef6aec82185fc50d993.zip
chromium_src-0d4e6553190cfa98cbc29ef6aec82185fc50d993.tar.gz
chromium_src-0d4e6553190cfa98cbc29ef6aec82185fc50d993.tar.bz2
Load devtools files from resources.pak rather than from disk.
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. BUG=35793 Review URL: http://codereview.chromium.org/6670072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rw-r--r--chrome/chrome.gyp1
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',