| Index: ui/aura/aura.gyp
|
| diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
|
| index 827da52b595210920b8b0e5e68b5318f28dfca2e..8e805eee2eceef972cd47842f19094a0e5c01845 100644
|
| --- a/ui/aura/aura.gyp
|
| +++ b/ui/aura/aura.gyp
|
| @@ -101,13 +101,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',
|
| @@ -143,6 +136,7 @@
|
| '../../skia/skia.gyp:skia',
|
| '../../testing/gtest.gyp:gtest',
|
| '../gfx/compositor/compositor.gyp:compositor_test_support',
|
| + '../gfx/compositor/compositor.gyp:compositor',
|
| '../gfx/gl/gl.gyp:gl',
|
| '../ui.gyp:gfx_resources',
|
| '../ui.gyp:ui',
|
| @@ -172,15 +166,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',
|
| - ],
|
| - }],
|
| ],
|
| },
|
| ],
|
|
|