cc/cc.gyp - Issue 1898033003: Revert https://codereview.chromium.org/1871233002

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

Issue 1898033003: Revert https://codereview.chromium.org/1871233002 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 8 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: cc/cc.gyp

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

index 6031f42697bbb2758ac6dea2fddd281139c926e4..67ad62d7dbe85e8fb5675b00f2b7db6dc74dcf85 100644

--- a/cc/cc.gyp

+++ b/cc/cc.gyp

@@ -19,10 +19,10 @@

'<(DEPTH)/media/media.gyp:media',

'<(DEPTH)/skia/skia.gyp:skia',

'<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite',

+ '<(DEPTH)/ui/events/events.gyp:events_base',

'<(DEPTH)/ui/gfx/gfx.gyp:gfx',

'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',

'<(DEPTH)/ui/gl/gl.gyp:gl',

- "<(DEPTH)/ui/latency_info/latency_info.gyp:latency_info",

'variables': {

'optimize': 'max',

@@ -665,9 +665,9 @@

'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',

'<(DEPTH)/gpu/gpu.gyp:gpu',

'<(DEPTH)/skia/skia.gyp:skia',

+ '<(DEPTH)/ui/events/events.gyp:events_base',

'<(DEPTH)/ui/gfx/gfx.gyp:gfx',

'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',

- "<(DEPTH)/ui/latency_info/latency_info.gyp:latency_info",

'defines': [

'CC_SURFACES_IMPLEMENTATION=1',

« no previous file with comments | « cc/DEPS ('k') | cc/cc_tests.gyp » ('j') | no next file with comments »