Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(409)

Unified Diff: tools/gn/bootstrap/bootstrap.py

Issue 2820433005: memory-infra: Start disentangling tracing from memory-infra (Closed)
Patch Set: pass config in Created 3 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:
View side-by-side diff with in-line comments
Download patch
Index: tools/gn/bootstrap/bootstrap.py
diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
index 8252799c578da1d541fdccb641d285e8c12239fa..c2c00a6cf03b0a143f5057cb76c83d4124e574b4 100755
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -516,6 +516,7 @@ def write_gn_ninja(path, root_gen_dir, options):
'base/trace_event/heap_profiler_stack_frame_deduplicator.cc',
'base/trace_event/heap_profiler_type_name_deduplicator.cc',
'base/trace_event/memory_allocator_dump.cc',
+ 'base/trace_event/memory_allocator_dump.cc',
Primiano Tucci (use gerrit) 2017/04/21 10:10:27 rebase conflict?
hjd 2017/04/21 11:51:58 Thanks!
'base/trace_event/memory_allocator_dump_guid.cc',
'base/trace_event/memory_dump_manager.cc',
'base/trace_event/memory_dump_provider_info.cc',
@@ -524,6 +525,7 @@ def write_gn_ninja(path, root_gen_dir, options):
'base/trace_event/memory_dump_session_state.cc',
'base/trace_event/memory_infra_background_whitelist.cc',
'base/trace_event/memory_peak_detector.cc',
+ 'base/trace_event/memory_tracing_observer.cc',
'base/trace_event/process_memory_dump.cc',
'base/trace_event/process_memory_maps.cc',
'base/trace_event/process_memory_totals.cc',
« base/trace_event/memory_tracing_observer.cc ('K') | « base/trace_event/memory_tracing_observer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698