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

Side by Side Diff: tools/gn/bootstrap/bootstrap.py

Issue 1517983003: tools/gn: depend on malloc_dump_provider.cc to keep bootstrap working (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright 2014 The Chromium Authors. All rights reserved. 2 # Copyright 2014 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 """Bootstraps gn. 6 """Bootstraps gn.
7 7
8 It is done by first building it manually in a temporary directory, then building 8 It is done by first building it manually in a temporary directory, then building
9 it with its own BUILD.gn to the final destination. 9 it with its own BUILD.gn to the final destination.
10 """ 10 """
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 'base/threading/thread_local_storage.cc', 241 'base/threading/thread_local_storage.cc',
242 'base/threading/thread_restrictions.cc', 242 'base/threading/thread_restrictions.cc',
243 'base/threading/worker_pool.cc', 243 'base/threading/worker_pool.cc',
244 'base/time/time.cc', 244 'base/time/time.cc',
245 'base/timer/elapsed_timer.cc', 245 'base/timer/elapsed_timer.cc',
246 'base/timer/timer.cc', 246 'base/timer/timer.cc',
247 'base/trace_event/heap_profiler_allocation_context.cc', 247 'base/trace_event/heap_profiler_allocation_context.cc',
248 'base/trace_event/heap_profiler_allocation_context_tracker.cc', 248 'base/trace_event/heap_profiler_allocation_context_tracker.cc',
249 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc', 249 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc',
250 'base/trace_event/heap_profiler_type_name_deduplicator.cc', 250 'base/trace_event/heap_profiler_type_name_deduplicator.cc',
251 'base/trace_event/malloc_dump_provider.cc',
ionlupascu 2015/12/11 21:48:17 Your fix is wrong. By doing this you brake windows
tfarina 2015/12/11 22:18:24 Done. https://codereview.chromium.org/1521063002
251 'base/trace_event/memory_allocator_dump.cc', 252 'base/trace_event/memory_allocator_dump.cc',
252 'base/trace_event/memory_allocator_dump_guid.cc', 253 'base/trace_event/memory_allocator_dump_guid.cc',
253 'base/trace_event/memory_dump_manager.cc', 254 'base/trace_event/memory_dump_manager.cc',
254 'base/trace_event/memory_dump_request_args.cc', 255 'base/trace_event/memory_dump_request_args.cc',
255 'base/trace_event/memory_dump_session_state.cc', 256 'base/trace_event/memory_dump_session_state.cc',
256 'base/trace_event/process_memory_dump.cc', 257 'base/trace_event/process_memory_dump.cc',
257 'base/trace_event/process_memory_maps.cc', 258 'base/trace_event/process_memory_maps.cc',
258 'base/trace_event/process_memory_totals.cc', 259 'base/trace_event/process_memory_totals.cc',
259 'base/trace_event/process_memory_totals_dump_provider.cc', 260 'base/trace_event/process_memory_totals_dump_provider.cc',
260 'base/trace_event/trace_buffer.cc', 261 'base/trace_event/trace_buffer.cc',
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 static_libraries['base']['sources'].extend([ 334 static_libraries['base']['sources'].extend([
334 'base/nix/xdg_util.cc', 335 'base/nix/xdg_util.cc',
335 'base/process/internal_linux.cc', 336 'base/process/internal_linux.cc',
336 'base/process/process_handle_linux.cc', 337 'base/process/process_handle_linux.cc',
337 'base/process/process_iterator_linux.cc', 338 'base/process/process_iterator_linux.cc',
338 'base/process/process_linux.cc', 339 'base/process/process_linux.cc',
339 'base/process/process_metrics_linux.cc', 340 'base/process/process_metrics_linux.cc',
340 'base/strings/sys_string_conversions_posix.cc', 341 'base/strings/sys_string_conversions_posix.cc',
341 'base/sys_info_linux.cc', 342 'base/sys_info_linux.cc',
342 'base/threading/platform_thread_linux.cc', 343 'base/threading/platform_thread_linux.cc',
343 'base/trace_event/malloc_dump_provider.cc', 344 'base/trace_event/malloc_dump_provider.cc',
ionlupascu 2015/12/11 21:48:17 Under linux is already added. This is good.
344 'base/trace_event/process_memory_maps_dump_provider.cc', 345 'base/trace_event/process_memory_maps_dump_provider.cc',
345 ]) 346 ])
346 static_libraries['libevent']['include_dirs'].extend([ 347 static_libraries['libevent']['include_dirs'].extend([
347 os.path.join(SRC_ROOT, 'third_party', 'libevent', 'linux') 348 os.path.join(SRC_ROOT, 'third_party', 'libevent', 'linux')
348 ]) 349 ])
349 static_libraries['libevent']['sources'].extend([ 350 static_libraries['libevent']['sources'].extend([
350 'third_party/libevent/epoll.c', 351 'third_party/libevent/epoll.c',
351 ]) 352 ])
352 353
353 354
354 if is_mac: 355 if is_mac:
355 static_libraries['base']['sources'].extend([ 356 static_libraries['base']['sources'].extend([
356 'base/base_paths_mac.mm', 357 'base/base_paths_mac.mm',
357 'base/files/file_util_mac.mm', 358 'base/files/file_util_mac.mm',
358 'base/mac/bundle_locations.mm', 359 'base/mac/bundle_locations.mm',
359 'base/mac/call_with_eh_frame.cc', 360 'base/mac/call_with_eh_frame.cc',
360 'base/mac/call_with_eh_frame_asm.S', 361 'base/mac/call_with_eh_frame_asm.S',
361 'base/mac/foundation_util.mm', 362 'base/mac/foundation_util.mm',
362 'base/mac/mach_logging.cc', 363 'base/mac/mach_logging.cc',
363 'base/mac/scoped_mach_port.cc', 364 'base/mac/scoped_mach_port.cc',
364 'base/mac/scoped_nsautorelease_pool.mm', 365 'base/mac/scoped_nsautorelease_pool.mm',
365 'base/message_loop/message_pump_mac.mm', 366 'base/message_loop/message_pump_mac.mm',
366 'base/process/process_handle_mac.cc', 367 'base/process/process_handle_mac.cc',
367 'base/process/process_iterator_mac.cc', 368 'base/process/process_iterator_mac.cc',
368 'base/process/process_metrics_mac.cc', 369 'base/process/process_metrics_mac.cc',
369 'base/strings/sys_string_conversions_mac.mm', 370 'base/strings/sys_string_conversions_mac.mm',
370 'base/time/time_mac.cc', 371 'base/time/time_mac.cc',
371 'base/threading/platform_thread_mac.mm', 372 'base/threading/platform_thread_mac.mm',
ionlupascu 2015/12/11 21:48:17 Here should be the correct fix.
372 ]) 373 ])
373 static_libraries['libevent']['include_dirs'].extend([ 374 static_libraries['libevent']['include_dirs'].extend([
374 os.path.join(SRC_ROOT, 'third_party', 'libevent', 'mac') 375 os.path.join(SRC_ROOT, 'third_party', 'libevent', 'mac')
375 ]) 376 ])
376 static_libraries['libevent']['sources'].extend([ 377 static_libraries['libevent']['sources'].extend([
377 'third_party/libevent/kqueue.c', 378 'third_party/libevent/kqueue.c',
378 ]) 379 ])
379 380
380 381
381 if is_mac: 382 if is_mac:
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 cmd.append('-v') 450 cmd.append('-v')
450 cmd.append('gn') 451 cmd.append('gn')
451 check_call(cmd) 452 check_call(cmd)
452 453
453 if not options.debug: 454 if not options.debug:
454 check_call(['strip', os.path.join(build_dir, 'gn')]) 455 check_call(['strip', os.path.join(build_dir, 'gn')])
455 456
456 457
457 if __name__ == '__main__': 458 if __name__ == '__main__':
458 sys.exit(main(sys.argv[1:])) 459 sys.exit(main(sys.argv[1:]))
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698