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

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

Patch Set: merge to r83717 Created 9 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: base/base.gyp

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

index 868e20ee7659ed8a0f25929104a80d2e15344584..f62935065cdf7e1fa5267b87e19cc0f7131cc9c1 100644

--- a/base/base.gyp

+++ b/base/base.gyp

@@ -115,6 +115,7 @@

'cpu_unittest.cc',

'debug/leak_tracker_unittest.cc',

'debug/stack_trace_unittest.cc',

+ 'debug/trace_event_unittest.cc',

'debug/trace_event_win_unittest.cc',

'dir_reader_posix_unittest.cc',

'environment_unittest.cc',

« no previous file with comments | « no previous file | base/base.gypi » ('j') | base/debug/trace_event.h » ('J')