commit 9232585085b68b9679204ab5ccc03638dc2be2bd
author Tom Anderson <thomasanderson@chromium.org> Thu Jan 18 19:53:43 2018 +0000
committer Commit Bot <commit-bot@chromium.org> Thu Jan 18 19:53:43 2018 +0000
tree f4d35bfb37fecb0efcd050819e98609ec45f638d
parent f2abba7c73c60611742d162b24efb3f81e34b1be

Fix gn bootstrap

BUG=803324
R=dpranke

Change-Id: Ib8a66495b9657da130a6608e6dacf6cf471cd504
Reviewed-on: https://chromium-review.googlesource.com/874870
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#530236}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 4c76252228505ce85f2965f71facaf41407f13c4

tools/gn/bootstrap/bootstrap.py

diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
index 6e7d145..3d29e50 100755
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -225,10 +225,9 @@
     write_compiled_message(root_gen_dir,
         'base/trace_event/etw_manifest/chrome_events_win.man')
 
-  if is_android:
-    write_buildflag_header_manually(
-        root_gen_dir, 'base/android/library_loader.h',
-        {'USE_LLD': 'false'})
+  write_buildflag_header_manually(
+      root_gen_dir, 'base/android/library_loader.h',
+      {'USE_LLD': 'false'})
 
   write_gn_ninja(os.path.join(tempdir, 'build.ninja'),
                  root_gen_dir, options)
@@ -468,13 +467,12 @@
       'base/json/json_string_value_serializer.cc',
       'base/json/json_writer.cc',
       'base/json/string_escape.cc',
-      'base/lazy_instance.cc',
+      'base/lazy_instance_helpers.cc',
       'base/location.cc',
       'base/logging.cc',
       'base/md5.cc',
       'base/memory/ref_counted.cc',
       'base/memory/ref_counted_memory.cc',
-      'base/memory/singleton.cc',
       'base/memory/shared_memory_handle.cc',
       'base/memory/shared_memory_tracker.cc',
       'base/memory/weak_ptr.cc',