summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/chrome_dll.gypi5
-rw-r--r--chrome/chrome_resources.gyp2
2 files changed, 6 insertions, 1 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 246b01c..b70ab12 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -53,6 +53,11 @@
'../ui/compositor/compositor.gyp:compositor',
],
}],
+ ['use_ash==1', {
+ 'sources': [
+ '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_wallpaper_resources.rc',
+ ],
+ }],
['OS=="win"', {
'product_name': 'chrome',
'dependencies': [
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 8018ceb..867ecaf 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -300,7 +300,7 @@
},
],
'conditions': [
- ['use_aura==1', {
+ ['use_ash==1', {
'dependencies': [
'<(DEPTH)/ash/ash.gyp:ash_resources',
'<(DEPTH)/ash/ash.gyp:ash_wallpaper_resources',