diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-30 16:34:40 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-30 16:34:40 +0000 |
| commit | 02b2c90e60f69349bb300134539dca37a398cacd (patch) | |
| tree | af938cebc68e94ed1c4c9fd7e86489b46b00b035 /athena | |
| parent | ce49c9e780ed54eafb35d39b13eabe4fe3176392 (diff) | |
| download | chromium_src-02b2c90e60f69349bb300134539dca37a398cacd.zip chromium_src-02b2c90e60f69349bb300134539dca37a398cacd.tar.gz chromium_src-02b2c90e60f69349bb300134539dca37a398cacd.tar.bz2 | |
extensions: Combine extensions_pak with app_shell_pak
Use the same .pak file for both app_shell and
extensions_unittests by merging app_shell_pak into extensions_pak.
BUG=397250,394469
TEST=extensions_unittests and app_shell
R=jamescook@chromium.org
TBR=yoz@chromium.org
Review URL: https://codereview.chromium.org/418283006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286536 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'athena')
| -rw-r--r-- | athena/resources/athena_resources.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/athena/resources/athena_resources.gyp b/athena/resources/athena_resources.gyp index 3e8c7ce..e9a4ed9 100644 --- a/athena/resources/athena_resources.gyp +++ b/athena/resources/athena_resources.gyp @@ -13,7 +13,7 @@ 'dependencies': [ '../../ash/ash_resources.gyp:ash_resources', '../../content/content_resources.gyp:content_resources', - '../../extensions/shell/app_shell.gyp:app_shell_pak', + '../../extensions/extensions.gyp:extensions_shell_and_test_pak', '../../third_party/WebKit/public/blink_resources.gyp:blink_resources', '../../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', '../../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings', |