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

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

Issue 2883473002: gn: fix bootstrap on windows (Closed)
Patch Set: Created 3 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/bootstrap/bootstrap.py
diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
index 217add224b9f8973fa8db4feb787daed6eb4b83e..847467f7503318f37e003da2319e0b24eb220e3c 100755
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -407,13 +407,13 @@ def write_gn_ninja(path, root_gen_dir, options):
'base/command_line.cc',
'base/debug/activity_tracker.cc',
'base/debug/alias.cc',
+ 'base/debug/crash_logging.cc',
'base/debug/dump_without_crashing.cc',
'base/debug/stack_trace.cc',
'base/debug/task_annotator.cc',
'base/environment.cc',
'base/feature_list.cc',
'base/files/file.cc',
- 'base/files/file_descriptor_watcher_posix.cc',
'base/files/file_enumerator.cc',
'base/files/file_path.cc',
'base/files/file_path_constants.cc',
@@ -436,7 +436,6 @@ def write_gn_ninja(path, root_gen_dir, options):
'base/memory/ref_counted_memory.cc',
'base/memory/singleton.cc',
'base/memory/shared_memory_handle.cc',
- 'base/memory/shared_memory_helper.cc',
'base/memory/weak_ptr.cc',
'base/message_loop/incoming_task_queue.cc',
'base/message_loop/message_loop.cc',
@@ -538,6 +537,7 @@ def write_gn_ninja(path, root_gen_dir, options):
'base/trace_event/heap_profiler_serialization_state.cc',
'base/trace_event/heap_profiler_stack_frame_deduplicator.cc',
'base/trace_event/heap_profiler_type_name_deduplicator.cc',
+ 'base/trace_event/malloc_dump_provider.cc',
'base/trace_event/memory_allocator_dump.cc',
'base/trace_event/memory_allocator_dump_guid.cc',
'base/trace_event/memory_dump_manager.cc',
@@ -575,9 +575,11 @@ def write_gn_ninja(path, root_gen_dir, options):
'base/debug/debugger_posix.cc',
'base/debug/stack_trace_posix.cc',
'base/files/file_enumerator_posix.cc',
+ 'base/files/file_descriptor_watcher_posix.cc',
'base/files/file_posix.cc',
'base/files/file_util_posix.cc',
'base/files/memory_mapped_file_posix.cc',
+ 'base/memory/shared_memory_helper.cc',
'base/message_loop/message_pump_libevent.cc',
'base/posix/file_descriptor_shuffle.cc',
'base/posix/global_descriptors.cc',
@@ -646,7 +648,6 @@ def write_gn_ninja(path, root_gen_dir, options):
'base/strings/sys_string_conversions_posix.cc',
'base/sys_info_linux.cc',
'base/threading/platform_thread_linux.cc',
- 'base/trace_event/malloc_dump_provider.cc',
])
if is_linux:
static_libraries['base']['sources'].extend([
@@ -698,7 +699,6 @@ def write_gn_ninja(path, root_gen_dir, options):
'base/strings/sys_string_conversions_mac.mm',
'base/time/time_mac.cc',
'base/threading/platform_thread_mac.mm',
- 'base/trace_event/malloc_dump_provider.cc',
])
static_libraries['libevent']['include_dirs'].extend([
os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'mac')
@@ -729,6 +729,7 @@ def write_gn_ninja(path, root_gen_dir, options):
'base/files/file_util_win.cc',
'base/files/file_win.cc',
'base/files/memory_mapped_file_win.cc',
+ 'base/guid.cc',
'base/logging_win.cc',
'base/memory/memory_pressure_monitor_win.cc',
'base/memory/shared_memory_handle_win.cc',
@@ -758,7 +759,6 @@ def write_gn_ninja(path, root_gen_dir, options):
'base/sys_info_win.cc',
'base/threading/platform_thread_win.cc',
'base/threading/thread_local_storage_win.cc',
- 'base/threading/thread_local_win.cc',
'base/threading/worker_pool_win.cc',
'base/time/time_win.cc',
'base/timer/hi_res_timer_manager_win.cc',
@@ -789,15 +789,16 @@ def write_gn_ninja(path, root_gen_dir, options):
])
libs.extend([
+ 'advapi32.lib',
+ 'dbghelp.lib',
'kernel32.lib',
- 'user32.lib',
- 'shell32.lib',
'ole32.lib',
- 'winmm.lib',
- 'ws2_32.lib',
+ 'shell32.lib',
+ 'user32.lib',
'userenv.lib',
'version.lib',
- 'dbghelp.lib',
+ 'winmm.lib',
+ 'ws2_32.lib',
])
# we just build static libraries that GN needs
« 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