base/base.gypi - Issue 837303004: Move base/debug/trace_event* to base/trace_event/ [part 1]

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 837303004: Move base/debug/trace_event* to base/trace_event/ [part 1] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing merge conflicts Created 5 years, 11 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: base/base.gypi

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

index 1d19597ee22f1b922c18886ef0c570c7224d2b51..6cc177c079d7d2c025937185e76e710d99bc3e00 100644

--- a/base/base.gypi

+++ b/base/base.gypi

@@ -171,18 +171,10 @@

'debug/task_annotator.cc',

'debug/task_annotator.h',

'debug/trace_event.h',

- 'debug/trace_event_android.cc',

- 'debug/trace_event_argument.cc',

'debug/trace_event_argument.h',

- 'debug/trace_event_impl.cc',

'debug/trace_event_impl.h',

- 'debug/trace_event_impl_constants.cc',

- 'debug/trace_event_synthetic_delay.cc',

'debug/trace_event_synthetic_delay.h',

- 'debug/trace_event_system_stats_monitor.cc',

- 'debug/trace_event_memory.cc',

- 'debug/trace_event_memory.h',

- 'debug/trace_event_win.cc',

+ 'debug/trace_event_win.h',

'deferred_sequenced_task_runner.cc',

'deferred_sequenced_task_runner.h',

'environment.cc',

@@ -680,6 +672,21 @@

'timer/mock_timer.h',

'timer/timer.cc',

'timer/timer.h',

+ 'trace_event/trace_event.h',

+ 'trace_event/trace_event_android.cc',

+ 'trace_event/trace_event_argument.cc',

+ 'trace_event/trace_event_argument.h',

+ 'trace_event/trace_event_impl.cc',

+ 'trace_event/trace_event_impl.h',

+ 'trace_event/trace_event_impl_constants.cc',

+ 'trace_event/trace_event_memory.cc',

+ 'trace_event/trace_event_memory.h',

+ 'trace_event/trace_event_synthetic_delay.cc',

+ 'trace_event/trace_event_synthetic_delay.h',

+ 'trace_event/trace_event_system_stats_monitor.cc',

+ 'trace_event/trace_event_system_stats_monitor.h',

+ 'trace_event/trace_event_win.cc',

+ 'trace_event/trace_event_win.h',

'tracked_objects.cc',

'tracked_objects.h',

'tracking_info.cc',

« no previous file with comments | « base/base.gyp ('k') | base/debug/trace_event.h » ('j') | no next file with comments »