diff options
Diffstat (limited to 'ui/aura/aura.gyp')
| -rw-r--r-- | ui/aura/aura.gyp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp index f6e03a6..735f067 100644 --- a/ui/aura/aura.gyp +++ b/ui/aura/aura.gyp @@ -60,6 +60,7 @@ 'dependencies': [ '../../skia/skia.gyp:skia', '../../testing/gtest.gyp:gtest', + '../gfx/compositor/compositor.gyp:test_compositor', '../ui.gyp:ui', 'aura', ], @@ -80,13 +81,6 @@ 'test/test_window_delegate.cc', 'test/test_window_delegate.h', ], - 'conditions': [ - ['use_webkit_compositor==0', { - 'dependencies': [ - '../gfx/compositor/compositor.gyp:test_compositor', - ], - }], - ], }, { 'target_name': 'aura_demo', @@ -122,6 +116,7 @@ '../../skia/skia.gyp:skia', '../../testing/gtest.gyp:gtest', '../gfx/compositor/compositor.gyp:compositor_test_support', + '../gfx/compositor/compositor.gyp:test_compositor', '../gfx/gl/gl.gyp:gl', '../ui.gyp:gfx_resources', '../ui.gyp:ui', @@ -149,15 +144,6 @@ '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', ], }], - ['use_webkit_compositor==1', { - 'dependencies': [ - '../gfx/compositor/compositor.gyp:compositor', - ], - }, { # use_webkit_compositor!=1 - 'dependencies': [ - '../gfx/compositor/compositor.gyp:test_compositor', - ], - }], ], }, ], |