base/trace_event/trace_event.gypi - Issue 1180693002: Update from https://crrev.com/333737

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/trace_event/trace_event.gypi

Issue 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: rebased Created 5 years, 6 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/trace_event/trace_event.gypi

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

index 9a072e490037013d6f14326cf290bddb399ad256..b595004da62286aa53a4a3c19ebe793283891102 100644

--- a/base/trace_event/trace_event.gypi

+++ b/base/trace_event/trace_event.gypi

@@ -8,6 +8,8 @@

'trace_event/java_heap_dump_provider_android.h',

'trace_event/memory_allocator_dump.cc',

'trace_event/memory_allocator_dump.h',

+ 'trace_event/memory_allocator_dump_guid.cc',

+ 'trace_event/memory_allocator_dump_guid.h',

'trace_event/memory_dump_manager.cc',

'trace_event/memory_dump_manager.h',

'trace_event/memory_dump_provider.h',

@@ -24,6 +26,8 @@

'trace_event/process_memory_totals.h',

'trace_event/process_memory_totals_dump_provider.cc',

'trace_event/process_memory_totals_dump_provider.h',

+ 'trace_event/trace_config.cc',

+ 'trace_event/trace_config.h',

'trace_event/trace_event.h',

'trace_event/trace_event_android.cc',

'trace_event/trace_event_argument.cc',

@@ -56,8 +60,10 @@

'trace_event/java_heap_dump_provider_android_unittest.cc',

'trace_event/memory_allocator_dump_unittest.cc',

'trace_event/memory_dump_manager_unittest.cc',

+ 'trace_event/process_memory_dump_unittest.cc',

'trace_event/process_memory_maps_dump_provider_unittest.cc',

'trace_event/process_memory_totals_dump_provider_unittest.cc',

+ 'trace_event/trace_config_unittest.cc',

'trace_event/trace_event_argument_unittest.cc',

'trace_event/trace_event_memory_unittest.cc',

'trace_event/trace_event_synthetic_delay_unittest.cc',

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