summaryrefslogtreecommitdiffstats
path: root/ui/aura_shell/aura_shell.gyp
diff options
context:
space:
mode:
Diffstat (limited to 'ui/aura_shell/aura_shell.gyp')
-rw-r--r--ui/aura_shell/aura_shell.gyp12
1 files changed, 1 insertions, 11 deletions
diff --git a/ui/aura_shell/aura_shell.gyp b/ui/aura_shell/aura_shell.gyp
index fc4f0d1..2e1d430 100644
--- a/ui/aura_shell/aura_shell.gyp
+++ b/ui/aura_shell/aura_shell.gyp
@@ -135,6 +135,7 @@
'../aura/aura.gyp:aura',
'../aura/aura.gyp:test_support_aura',
'../gfx/compositor/compositor.gyp:compositor_test_support',
+ '../gfx/compositor/compositor.gyp:test_compositor',
'../ui.gyp:gfx_resources',
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
@@ -169,17 +170,6 @@
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
],
- 'conditions': [
- ['use_webkit_compositor==1', {
- 'dependencies': [
- '../gfx/compositor/compositor.gyp:compositor',
- ],
- }, { # use_webkit_compositor!=1
- 'dependencies': [
- '../gfx/compositor/compositor.gyp:test_compositor',
- ],
- }],
- ],
},
{
'target_name': 'aura_shell_exe',