base/base.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: base/base.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: base/base.gypi

diff --git a/base/base.gypi b/base/base.gypi

index 51f50ed4163b4adc214e0a3f6fb085fe368e1f28..578e50d1c8c465b155cb5c76300407cf8d438241 100644

--- a/base/base.gypi

+++ b/base/base.gypi

@@ -404,7 +404,6 @@

# regression to page cycler moz.

'sha1_win.cc',

'string16.cc',

- 'debug/trace_event.cc',

},],

['OS=="freebsd" or OS=="openbsd"', {