Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(240)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/aura_shell/aura_shell.gyp

Issue 8805033: Makes tests either use mock compositor or mock WebGraphicsContext3D (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tweaks Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« content/content_tests.gypi ('K') | « ui/aura/test/test_suite.cc ('k') | ui/aura_shell/test_suite.cc » ('j') | ui/gfx/compositor/compositor_setup.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/aura_shell.gyp
diff --git a/ui/aura_shell/aura_shell.gyp b/ui/aura_shell/aura_shell.gyp
index 74f9431f31b669b8b68c86a73bb8015314b620ff..81952026fdc9911e190ce36a1fd764d90ac66c6b 100644
--- a/ui/aura_shell/aura_shell.gyp
+++ b/ui/aura_shell/aura_shell.gyp
@@ -135,7 +135,6 @@
'../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',
@@ -170,6 +169,17 @@
'<(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',
« content/content_tests.gypi ('K') | « ui/aura/test/test_suite.cc ('k') | ui/aura_shell/test_suite.cc » ('j') | ui/gfx/compositor/compositor_setup.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698