diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-22 00:31:38 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-22 00:31:38 +0000 |
| commit | 0d4e6553190cfa98cbc29ef6aec82185fc50d993 (patch) | |
| tree | 248ca7ab102c972e6aa81ef12b3c27253f76ce64 /chrome/tools | |
| parent | 3cb642967a61a3d46b226fb4ce39e69086dde2c6 (diff) | |
| download | chromium_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/tools')
| -rw-r--r-- | chrome/tools/build/win/FILES | 1 | ||||
| -rw-r--r-- | chrome/tools/build/win/FILES.cfg | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/chrome/tools/build/win/FILES b/chrome/tools/build/win/FILES index 73ce368..825aa6c 100644 --- a/chrome/tools/build/win/FILES +++ b/chrome/tools/build/win/FILES @@ -58,7 +58,6 @@ locales/uk.dll locales/vi.dll locales/zh-CN.dll locales/zh-TW.dll -resources resources.pak wow_helper.exe gcswf32.dll diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg index c3b9c2e..05739fc 100644 --- a/chrome/tools/build/win/FILES.cfg +++ b/chrome/tools/build/win/FILES.cfg @@ -311,11 +311,6 @@ FILES = [ 'buildtype': ['dev', 'official'], }, { - 'filename': 'resources', - 'arch': ['32bit', '64bit'], - 'buildtype': ['dev', 'official'], - }, - { 'filename': 'resources.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], |