From b45a387d33a702ebf816dcb14e783cdd0669e87d Mon Sep 17 00:00:00 2001 From: "kcconley@gmail.com" Date: Wed, 20 Aug 2014 22:39:08 +0000 Subject: [PATCH] GN: fix bootstrap.py due to recent changes in //base NOTRY=true R=brettw@chromium.org BUG= Review URL: https://codereview.chromium.org/491123002 Cr-Commit-Position: refs/heads/master@{#290931} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290931 0039d316-1c4b-4281-b951-d872f2087c98 --- tools/gn/bootstrap/bootstrap.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py index 82e94e505c9872..8907c1d67a5802 100755 --- a/tools/gn/bootstrap/bootstrap.py +++ b/tools/gn/bootstrap/bootstrap.py @@ -150,16 +150,17 @@ def write_ninja(path, options): 'base/command_line.cc', 'base/debug/alias.cc', 'base/debug/stack_trace.cc', + 'base/debug/task_annotator.cc', 'base/debug/trace_event_impl.cc', 'base/debug/trace_event_impl_constants.cc', 'base/debug/trace_event_memory.cc', 'base/debug/trace_event_synthetic_delay.cc', 'base/environment.cc', - 'base/file_util.cc', 'base/files/file.cc', 'base/files/file_enumerator.cc', 'base/files/file_path.cc', 'base/files/file_path_constants.cc', + 'base/files/file_util.cc', 'base/files/scoped_file.cc', 'base/json/json_parser.cc', 'base/json/json_reader.cc', @@ -239,9 +240,9 @@ def write_ninja(path, options): 'base/base_paths_posix.cc', 'base/debug/debugger_posix.cc', 'base/debug/stack_trace_posix.cc', - 'base/file_util_posix.cc', 'base/files/file_enumerator_posix.cc', 'base/files/file_posix.cc', + 'base/files/file_util_posix.cc', 'base/message_loop/message_pump_libevent.cc', 'base/posix/file_descriptor_shuffle.cc', 'base/process/kill_posix.cc', @@ -312,7 +313,7 @@ def write_ninja(path, options): if is_mac: static_libraries['base']['sources'].extend([ 'base/base_paths_mac.mm', - 'base/file_util_mac.mm', + 'base/files/file_util_mac.mm', 'base/mac/bundle_locations.mm', 'base/mac/foundation_util.mm', 'base/mac/mach_logging.cc',