ash/ash.gyp - Issue 9288053: Remove old (pre-webkit) compositor

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: ash/ash.gyp

Issue 9288053: Remove old (pre-webkit) compositor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix test Created 8 years, 11 months 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: ash/ash.gyp

diff --git a/ash/ash.gyp b/ash/ash.gyp

index a2bf778f2baaa451c275ddf36b48e216a625f8b7..14030394ce98def16e8059378781a86e29a45e7a 100644

--- a/ash/ash.gyp

+++ b/ash/ash.gyp

@@ -193,6 +193,7 @@

'../third_party/icu/icu.gyp:icuuc',

'../ui/aura/aura.gyp:aura',

'../ui/aura/aura.gyp:test_support_aura',

+ '../ui/gfx/compositor/compositor.gyp:compositor',

'../ui/gfx/compositor/compositor.gyp:compositor_test_support',

'../ui/ui.gyp:gfx_resources',

'../ui/ui.gyp:ui',

@@ -246,15 +247,6 @@

'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',

'conditions': [

- ['use_webkit_compositor==1', {

- 'dependencies': [

- '../ui/gfx/compositor/compositor.gyp:compositor',

- ],

- }, { # use_webkit_compositor!=1

- 'dependencies': [

- '../ui/gfx/compositor/compositor.gyp:test_compositor',

- ],

- }],

['use_ibus==1', {

'dependencies': [

'../build/linux/system.gyp:ibus',

« no previous file with comments | « no previous file | ash/test/test_suite.cc » ('j') | no next file with comments »