Index: ui/snapshot/snapshot.gyp |
diff --git a/ui/snapshot/snapshot.gyp b/ui/snapshot/snapshot.gyp |
index a6a997e0b5d9f87c700cd5a6231101ba228e4df2..3aa1fcaba692ac492e31e210f0b5dd3d160e118a 100644 |
--- a/ui/snapshot/snapshot.gyp |
+++ b/ui/snapshot/snapshot.gyp |
@@ -11,8 +11,8 @@ |
'target_name': 'snapshot', |
'type': '<(component)', |
'dependencies': [ |
- '../../skia/skia.gyp:skia', |
'../../base/base.gyp:base', |
+ '../../skia/skia.gyp:skia', |
'../base/ui_base.gyp:ui_base', |
'../gfx/gfx.gyp:gfx', |
'../gfx/gfx.gyp:gfx_geometry', |
@@ -23,6 +23,8 @@ |
'sources': [ |
'snapshot.h', |
'snapshot_android.cc', |
+ 'snapshot_async.cc', |
+ 'snapshot_async.h', |
'snapshot_aura.cc', |
'snapshot_export.h', |
'snapshot_ios.mm', |
@@ -34,9 +36,20 @@ |
'..', |
], |
'conditions': [ |
- ['use_aura==1', { |
+ ['use_aura==1 or OS=="android"', { |
'dependencies': [ |
'../../cc/cc.gyp:cc', |
+ '../../gpu/gpu.gyp:command_buffer_common', |
+ ], |
+ }], |
+ ['use_aura!=1 and OS!="android"', { |
+ 'sources!': [ |
+ 'snapshot_async.cc', |
+ 'snapshot_async.h', |
+ ], |
+ }], |
+ ['use_aura==1', { |
+ 'dependencies': [ |
'../aura/aura.gyp:aura', |
'../compositor/compositor.gyp:compositor', |
], |