| 1 | --- a/tools/gn/bootstrap/bootstrap.py |
| 2 | +++ b/tools/gn/bootstrap/bootstrap.py |
| 3 | @@ -179,6 +179,7 @@ def build_gn_with_ninja_manually(tempdir, options): |
| 4 | |
| 5 | write_buildflag_header_manually(root_gen_dir, 'base/debug/debugging_flags.h', |
| 6 | { |
| 7 | + 'ENABLE_LOCATION_SOURCE': 'false', |
| 8 | 'ENABLE_PROFILING': 'false', |
| 9 | 'CAN_UNWIND_WITH_FRAME_POINTERS': 'false' |
| 10 | }) |
| 11 | @@ -204,7 +205,7 @@ def build_gn_with_ninja_manually(tempdir, options): |
| 12 | |
| 13 | write_gn_ninja(os.path.join(tempdir, 'build.ninja'), |
| 14 | root_gen_dir, options) |
| 15 | - cmd = ['ninja', '-C', tempdir] |
| 16 | + cmd = ['ninja', '-C', tempdir, '-w', 'dupbuild=err'] |
| 17 | if options.verbose: |
| 18 | cmd.append('-v') |
| 19 | |
| 20 | @@ -458,6 +459,7 @@ def write_gn_ninja(path, root_gen_dir, options): |
| 21 | 'base/metrics/bucket_ranges.cc', |
| 22 | 'base/metrics/field_trial.cc', |
| 23 | 'base/metrics/field_trial_param_associator.cc', |
| 24 | + 'base/metrics/field_trial_params.cc', |
| 25 | 'base/metrics/histogram.cc', |
| 26 | 'base/metrics/histogram_base.cc', |
| 27 | 'base/metrics/histogram_functions.cc', |
| 28 | @@ -507,6 +509,7 @@ def write_gn_ninja(path, root_gen_dir, options): |
| 29 | 'base/task_scheduler/scheduler_lock_impl.cc', |
| 30 | 'base/task_scheduler/scheduler_single_thread_task_runner_manager.cc', |
| 31 | 'base/task_scheduler/scheduler_worker.cc', |
| 32 | + 'base/task_scheduler/scheduler_worker_pool.cc', |
| 33 | 'base/task_scheduler/scheduler_worker_pool_impl.cc', |
| 34 | 'base/task_scheduler/scheduler_worker_pool_params.cc', |
| 35 | 'base/task_scheduler/scheduler_worker_stack.cc', |
| 36 | @@ -523,6 +526,7 @@ def write_gn_ninja(path, root_gen_dir, options): |
| 37 | 'base/third_party/icu/icu_utf.cc', |
| 38 | 'base/third_party/nspr/prtime.cc', |
| 39 | 'base/threading/post_task_and_reply_impl.cc', |
| 40 | + 'base/threading/scoped_blocking_call.cc', |
| 41 | 'base/threading/sequence_local_storage_map.cc', |
| 42 | 'base/threading/sequenced_task_runner_handle.cc', |
| 43 | 'base/threading/sequenced_worker_pool.cc', |
| 44 | @@ -579,7 +583,6 @@ def write_gn_ninja(path, root_gen_dir, options): |
| 45 | 'base/unguessable_token.cc', |
| 46 | 'base/value_iterators.cc', |
| 47 | 'base/values.cc', |
| 48 | - 'base/value_iterators.cc', |
| 49 | 'base/vlog.cc', |
| 50 | ]) |
| 51 | |
| 52 | @@ -652,7 +655,6 @@ def write_gn_ninja(path, root_gen_dir, options): |
| 53 | static_libraries['base']['sources'].extend([ |
| 54 | 'base/memory/shared_memory_handle_posix.cc', |
| 55 | 'base/memory/shared_memory_posix.cc', |
| 56 | - 'base/memory/shared_memory_tracker.cc', |
| 57 | 'base/nix/xdg_util.cc', |
| 58 | 'base/process/internal_linux.cc', |
| 59 | 'base/process/memory_linux.cc', |
| 60 | @@ -827,7 +829,7 @@ def build_gn_with_gn(temp_gn, build_dir, options): |
| 61 | cmd = [temp_gn, 'gen', build_dir, '--args=%s' % gn_gen_args] |
| 62 | check_call(cmd) |
| 63 | |
| 64 | - cmd = ['ninja', '-C', build_dir] |
| 65 | + cmd = ['ninja', '-C', build_dir, '-w', 'dupbuild=err'] |
| 66 | if options.verbose: |
| 67 | cmd.append('-v') |
| 68 | cmd.append('gn') |