diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 21:30:27 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 21:30:27 +0000 |
| commit | dbe3e4196d95a487248aaf45378ee38ca7cb8fcc (patch) | |
| tree | 0554857f7081eb5e26008dafd7ab19613b29b853 /chrome/chrome_repack_chrome_100_percent.gypi | |
| parent | 399990cdd5dd0f57be84f5bcd13ff96c5185ac43 (diff) | |
| download | chromium_src-dbe3e4196d95a487248aaf45378ee38ca7cb8fcc.zip chromium_src-dbe3e4196d95a487248aaf45378ee38ca7cb8fcc.tar.gz chromium_src-dbe3e4196d95a487248aaf45378ee38ca7cb8fcc.tar.bz2 | |
(reland r156610)
add ash_resources.grd and necessary changes to use images in ash/resources
BUG=146034
TEST=none
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=156610
Review URL: https://codereview.chromium.org/10905242
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_repack_chrome_100_percent.gypi')
| -rw-r--r-- | chrome/chrome_repack_chrome_100_percent.gypi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/chrome_repack_chrome_100_percent.gypi b/chrome/chrome_repack_chrome_100_percent.gypi index 8759593..da717c9 100644 --- a/chrome/chrome_repack_chrome_100_percent.gypi +++ b/chrome/chrome_repack_chrome_100_percent.gypi @@ -9,6 +9,13 @@ '<(grit_out_dir)/theme_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', ], + 'conditions': [ + ['use_aura==1', { + 'pak_inputs': [ + '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_resources_100_percent.pak', + ], + }], + ], }, 'inputs': [ '<(repack_path)', |