diff options
| author | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-13 22:50:28 +0000 |
|---|---|---|
| committer | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-13 22:50:28 +0000 |
| commit | 475a87a928354bd896d4149f69de2c01185f6187 (patch) | |
| tree | 6244df23cf0eb17201d2ee178017846032522edc /chrome/unit_tests.isolate | |
| parent | 864bca830cc7889b457f3e4a77be0712b3c69e93 (diff) | |
| download | chromium_src-475a87a928354bd896d4149f69de2c01185f6187.zip chromium_src-475a87a928354bd896d4149f69de2c01185f6187.tar.gz chromium_src-475a87a928354bd896d4149f69de2c01185f6187.tar.bz2 | |
Revert 217346 "Remove chrome.pak references, build resources int..."
Compile failures on main builders, not seen on try bots.
> Remove chrome.pak references, build resources into resources.pak
>
> This puts resources that used to be in chrome.pak and/or compiled in to
> chrome.dll into resources.pak. resources.pak is already loaded at startup
> on all platforms so having some resources in a separate pak file isn't
> beneficial.
>
> TBR=tony@chromium.org
>
> BUG=52609
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=216822
>
> Review URL: https://codereview.chromium.org/22339020
TBR=jamesr@chromium.org
Review URL: https://codereview.chromium.org/22794013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/unit_tests.isolate')
| -rw-r--r-- | chrome/unit_tests.isolate | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate index af2f167..59b789d 100644 --- a/chrome/unit_tests.isolate +++ b/chrome/unit_tests.isolate @@ -5,6 +5,9 @@ 'conditions': [ ['OS=="android" or OS=="linux"', { 'variables': { + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/chrome.pak', + ], 'isolate_dependency_untracked': [ '<(PRODUCT_DIR)/test_data/', ], |