ui/aura_shell/aura_shell.gyp - Issue 8889022: Attempt 2 at : Makes tests either use mock compositor or mock

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/aura_shell/aura_shell.gyp

Issue 8889022: Attempt 2 at : Makes tests either use mock compositor or mock (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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:

Index: ui/aura_shell/aura_shell.gyp

diff --git a/ui/aura_shell/aura_shell.gyp b/ui/aura_shell/aura_shell.gyp

index 2e1d4302db928631d8e195e63136bdd7b6484d77..fc4f0d19a4aeeddcea38bb51c4e53d36a179c578 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',

« no previous file with comments | « ui/aura/test/test_suite.cc ('k') | ui/aura_shell/test_suite.cc » ('j') | no next file with comments »