diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-01 15:31:52 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-01 15:31:52 +0000 |
| commit | b14c0c46e2c68d3f7c1497add00e2278add669f0 (patch) | |
| tree | f7df029435fbf8e8c7b2fe94e88d1a0d5616bf0f /athena | |
| parent | f9962f886a6f2704f5b6399607f212ddbca2316e (diff) | |
| download | chromium_src-b14c0c46e2c68d3f7c1497add00e2278add669f0.zip chromium_src-b14c0c46e2c68d3f7c1497add00e2278add669f0.tar.gz chromium_src-b14c0c46e2c68d3f7c1497add00e2278add669f0.tar.bz2 | |
athena: Re-add ui_chromeos resources in athena_resources.pak.
This was removed erroneously in r286666, since extensions_shell_and_test.pak
does not pull in ui_chromeos resources.
BUG=398947
R=tfarina@chromium.org
TBR=oshima@chromium.org
Review URL: https://codereview.chromium.org/424403004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287006 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'athena')
| -rw-r--r-- | athena/resources/athena_resources.gyp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/athena/resources/athena_resources.gyp b/athena/resources/athena_resources.gyp index 29632cf..a3dcbfc 100644 --- a/athena/resources/athena_resources.gyp +++ b/athena/resources/athena_resources.gyp @@ -13,6 +13,8 @@ 'dependencies': [ '../../ash/ash_resources.gyp:ash_resources', '../../extensions/extensions.gyp:extensions_shell_and_test_pak', + '../../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', + '../../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings', ], 'actions': [{ 'action_name': 'repack_athena_pack', @@ -20,6 +22,8 @@ 'pak_inputs': [ '<(PRODUCT_DIR)/extensions_shell_and_test.pak', '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/strings/ui_chromeos_strings_en-US.pak', ], 'pak_output': '<(PRODUCT_DIR)/athena_resources.pak', }, |