summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_repack_chrome_100_percent.gypi
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-13 19:57:33 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-13 19:57:33 +0000
commit8e05a73bdd4ed56455139b0ea9403516dde491c2 (patch)
treee77a484d51ff2d6f5cc317d539a239d4251a1815 /chrome/chrome_repack_chrome_100_percent.gypi
parente71e4bb1f095d308cb086e561014071089d7d415 (diff)
downloadchromium_src-8e05a73bdd4ed56455139b0ea9403516dde491c2.zip
chromium_src-8e05a73bdd4ed56455139b0ea9403516dde491c2.tar.gz
chromium_src-8e05a73bdd4ed56455139b0ea9403516dde491c2.tar.bz2
add ash_resources.grd and necessary changes to use images in ash/resources
BUG=146034 TEST=none Review URL: https://codereview.chromium.org/10905242 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156610 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_repack_chrome_100_percent.gypi')
-rw-r--r--chrome/chrome_repack_chrome_100_percent.gypi7
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)',