You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
69 lines
2.8 KiB
69 lines
2.8 KiB
7 years ago
|
--- a/tools/gn/bootstrap/bootstrap.py
|
||
|
|
+++ b/tools/gn/bootstrap/bootstrap.py
|
||
|
|
@@ -179,6 +179,7 @@ def build_gn_with_ninja_manually(tempdir, options):
|
||
|
|
|
||
|
|
write_buildflag_header_manually(root_gen_dir, 'base/debug/debugging_flags.h',
|
||
|
|
{
|
||
|
|
+ 'ENABLE_LOCATION_SOURCE': 'false',
|
||
|
|
'ENABLE_PROFILING': 'false',
|
||
|
|
'CAN_UNWIND_WITH_FRAME_POINTERS': 'false'
|
||
|
|
})
|
||
|
|
@@ -204,7 +205,7 @@ def build_gn_with_ninja_manually(tempdir, options):
|
||
|
|
|
||
|
|
write_gn_ninja(os.path.join(tempdir, 'build.ninja'),
|
||
|
|
root_gen_dir, options)
|
||
|
|
- cmd = ['ninja', '-C', tempdir]
|
||
|
|
+ cmd = ['ninja', '-C', tempdir, '-w', 'dupbuild=err']
|
||
|
|
if options.verbose:
|
||
|
|
cmd.append('-v')
|
||
|
|
|
||
|
|
@@ -458,6 +459,7 @@ def write_gn_ninja(path, root_gen_dir, options):
|
||
|
|
'base/metrics/bucket_ranges.cc',
|
||
|
|
'base/metrics/field_trial.cc',
|
||
|
|
'base/metrics/field_trial_param_associator.cc',
|
||
|
|
+ 'base/metrics/field_trial_params.cc',
|
||
|
|
'base/metrics/histogram.cc',
|
||
|
|
'base/metrics/histogram_base.cc',
|
||
|
|
'base/metrics/histogram_functions.cc',
|
||
|
|
@@ -507,6 +509,7 @@ def write_gn_ninja(path, root_gen_dir, options):
|
||
|
|
'base/task_scheduler/scheduler_lock_impl.cc',
|
||
|
|
'base/task_scheduler/scheduler_single_thread_task_runner_manager.cc',
|
||
|
|
'base/task_scheduler/scheduler_worker.cc',
|
||
|
|
+ 'base/task_scheduler/scheduler_worker_pool.cc',
|
||
|
|
'base/task_scheduler/scheduler_worker_pool_impl.cc',
|
||
|
|
'base/task_scheduler/scheduler_worker_pool_params.cc',
|
||
|
|
'base/task_scheduler/scheduler_worker_stack.cc',
|
||
|
|
@@ -523,6 +526,7 @@ def write_gn_ninja(path, root_gen_dir, options):
|
||
|
|
'base/third_party/icu/icu_utf.cc',
|
||
|
|
'base/third_party/nspr/prtime.cc',
|
||
|
|
'base/threading/post_task_and_reply_impl.cc',
|
||
|
|
+ 'base/threading/scoped_blocking_call.cc',
|
||
|
|
'base/threading/sequence_local_storage_map.cc',
|
||
|
|
'base/threading/sequenced_task_runner_handle.cc',
|
||
|
|
'base/threading/sequenced_worker_pool.cc',
|
||
|
|
@@ -579,7 +583,6 @@ def write_gn_ninja(path, root_gen_dir, options):
|
||
|
|
'base/unguessable_token.cc',
|
||
|
|
'base/value_iterators.cc',
|
||
|
|
'base/values.cc',
|
||
|
|
- 'base/value_iterators.cc',
|
||
|
|
'base/vlog.cc',
|
||
|
|
])
|
||
|
|
|
||
|
|
@@ -652,7 +655,6 @@ def write_gn_ninja(path, root_gen_dir, options):
|
||
|
|
static_libraries['base']['sources'].extend([
|
||
|
|
'base/memory/shared_memory_handle_posix.cc',
|
||
|
|
'base/memory/shared_memory_posix.cc',
|
||
|
|
- 'base/memory/shared_memory_tracker.cc',
|
||
|
|
'base/nix/xdg_util.cc',
|
||
|
|
'base/process/internal_linux.cc',
|
||
|
|
'base/process/memory_linux.cc',
|
||
|
|
@@ -827,7 +829,7 @@ def build_gn_with_gn(temp_gn, build_dir, options):
|
||
|
|
cmd = [temp_gn, 'gen', build_dir, '--args=%s' % gn_gen_args]
|
||
|
|
check_call(cmd)
|
||
|
|
|
||
|
|
- cmd = ['ninja', '-C', build_dir]
|
||
|
|
+ cmd = ['ninja', '-C', build_dir, '-w', 'dupbuild=err']
|
||
|
|
if options.verbose:
|
||
|
|
cmd.append('-v')
|
||
|
|
cmd.append('gn')
|