ui/aura/aura.gyp - Issue 8395043: Fix up compositor mocking.

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/aura.gyp

Issue 8395043: Fix up compositor mocking. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Deeper down the rabbit hole. Created 9 years, 2 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:

View side-by-side diff with in-line comments

Download patch

Index: ui/aura/aura.gyp

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

index a1d8704c982657317a54d73be3bd73eb68bfa53e..84fcb0e24e17c7e3ecee321dff4bc1ebefa12c4f 100644

--- a/ui/aura/aura.gyp

+++ b/ui/aura/aura.gyp

@@ -60,6 +60,7 @@

'dependencies': [

'../../skia/skia.gyp:skia',

'../../testing/gtest.gyp:gtest',

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

'../ui.gyp:ui',

'aura',

@@ -73,10 +74,6 @@

'test/event_generator.h',

'test/test_desktop_delegate.cc',

'test/test_desktop_delegate.h',

- '../gfx/compositor/test_compositor.cc',

- '../gfx/compositor/test_compositor.h',

- '../gfx/compositor/test_texture.cc',

- '../gfx/compositor/test_texture.h',

{

@@ -89,6 +86,7 @@

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

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

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

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

'../ui.gyp:gfx_resources',

'../ui.gyp:ui',

'../ui.gyp:ui_resources',

@@ -110,8 +108,8 @@

'../../base/base.gyp:test_support_base',

'../../skia/skia.gyp:skia',

'../../testing/gtest.gyp:gtest',

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

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

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

'../gfx/gl/gl.gyp:gl',

'../ui.gyp:gfx_resources',

'../ui.gyp:ui',

« no previous file with comments | « content/test/content_test_suite.cc ('k') | ui/aura/demo/demo_main.cc » ('j') | no next file with comments »