Index: ui/ui.gyp |
diff --git a/ui/ui.gyp b/ui/ui.gyp |
index 2cb8163955b469b9cb14ae7ce6dab7394a9382cc..473751f63b7b9e49f68c68b48811f2c3865cdc45 100644 |
--- a/ui/ui.gyp |
+++ b/ui/ui.gyp |
@@ -373,14 +373,14 @@ |
'conditions': [ |
# TODO(asvitkine): Switch all platforms to use canvas_skia.cc. |
# http://crbug.com/105550 |
- ['use_canvas_skia==1', { |
+ ['use_canvas_skia==1 or use_aura==1', { |
piman
2012/03/21 16:54:19
I think it would be more maintainable to set use_c
Alexei Svitkine (slow)
2012/03/21 16:59:20
Actually, I agree on this front. Was a little trig
|
'sources!': [ |
'gfx/canvas_android.cc', |
'gfx/canvas_linux.cc', |
'gfx/canvas_mac.mm', |
'gfx/canvas_win.cc', |
], |
- }, { # use_canvas_skia!=1 |
+ }, { # use_canvas_skia!=1 and use_aura!=1 |
'sources!': [ |
'gfx/canvas_skia.cc', |
], |