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

Unified Diff: base/base.gypi

Issue 885443002: Roll Chrome into Mojo. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Rebase to ToT mojo 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
« no previous file with comments | « base/base.gyp ('k') | base/base.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index 0c6ee7ebc1f9244b34d32ac1c90583ce527c5b0a..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',
@@ -779,6 +786,7 @@
'allocator/type_profiler_control.h',
'base_paths.cc',
'cpu.cc',
+ 'debug/stack_trace.cc',
'debug/stack_trace_posix.cc',
'files/file_enumerator_posix.cc',
'files/file_path_watcher_fsevents.cc',
@@ -789,17 +797,22 @@
'files/file_util.cc',
'files/file_util_posix.cc',
'files/file_util_proxy.cc',
+ 'files/important_file_writer.cc',
'memory/shared_memory_posix.cc',
'native_library_posix.cc',
'path_service.cc',
'posix/unix_domain_socket_linux.cc',
+ 'process/kill.cc',
'process/kill_posix.cc',
+ 'process/launch.cc',
'process/launch_posix.cc',
+ 'process/process_metrics.cc',
'process/process_metrics_posix.cc',
'process/process_posix.cc',
'rand_util_posix.cc',
'scoped_native_library.cc',
'files/scoped_temp_dir.cc',
+ 'sys_info.cc',
'sys_info_posix.cc',
'third_party/dynamic_annotations/dynamic_annotations.c',
],
« no previous file with comments | « base/base.gyp ('k') | base/base.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698