| Index: base/base.gypi | 
| diff --git a/base/base.gypi b/base/base.gypi | 
| index b4f779302502c5e9bca881a2b09484496d233cca..40c7d356816c7c9f85a0b2d18741782de8dcba7a 100644 | 
| --- a/base/base.gypi | 
| +++ b/base/base.gypi | 
| @@ -3,6 +3,9 @@ | 
| # found in the LICENSE file. | 
|  | 
| { | 
| +  'includes': [ | 
| +    'trace_event/trace_event.gypi', | 
| +  ], | 
| 'target_defaults': { | 
| 'variables': { | 
| 'base_target': 0, | 
| @@ -660,38 +663,6 @@ | 
| 'timer/mock_timer.h', | 
| 'timer/timer.cc', | 
| 'timer/timer.h', | 
| -          'trace_event/memory_allocator_attributes.h', | 
| -          'trace_event/memory_allocator_dump.cc', | 
| -          'trace_event/memory_allocator_dump.h', | 
| -          'trace_event/memory_dump_manager.cc', | 
| -          'trace_event/memory_dump_manager.h', | 
| -          'trace_event/memory_dump_provider.cc', | 
| -          'trace_event/memory_dump_provider.h', | 
| -          'trace_event/process_memory_dump.cc', | 
| -          'trace_event/process_memory_dump.h', | 
| -          'trace_event/process_memory_maps.cc', | 
| -          'trace_event/process_memory_maps.h', | 
| -          'trace_event/process_memory_maps_dump_provider.cc', | 
| -          'trace_event/process_memory_maps_dump_provider.h', | 
| -          'trace_event/process_memory_totals.cc', | 
| -          '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_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', | 
| @@ -754,6 +725,7 @@ | 
| 'win/windows_version.h', | 
| 'win/wrapped_window_proc.cc', | 
| 'win/wrapped_window_proc.h', | 
| +          '<@(trace_event_sources)', | 
| ], | 
| 'defines': [ | 
| 'BASE_IMPLEMENTATION', | 
|  |