From 02b2c90e60f69349bb300134539dca37a398cacd Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Wed, 30 Jul 2014 16:34:40 +0000 Subject: 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 --- athena/resources/athena_resources.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'athena') 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', -- cgit v1.1