webkit/glue/webkit_glue.gypi - Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event

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: webkit/glue/webkit_glue.gypi

Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: shared dll build, phishing test shutdown crashes, tsan warnings; merge 84612 Created 9 years, 7 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: webkit/glue/webkit_glue.gypi

diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi

index 74772cc0e869384d0d4e7593f2147873884ae313..23b9634552c8b1f080fa62c025084aeb1519ad7c 100644

--- a/webkit/glue/webkit_glue.gypi

+++ b/webkit/glue/webkit_glue.gypi

@@ -107,7 +107,6 @@

'dependencies': [

'<(DEPTH)/app/app.gyp:app_base',

'<(DEPTH)/base/base.gyp:base_i18n',

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

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

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

'<(DEPTH)/ppapi/ppapi.gyp:ppapi_shared_impl',