GN: Fix bootstrap.py on mac

tools/gn/bootstrap/bootstrap.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file isn't officially supported by the Chromium project. It's maintained
 # on a best-effort basis by volunteers, so some things may be broken from time
 # to time. If you encounter errors, it's most often due to files in base that
 # have been added or moved since somebody last tried this script. Generally
 # such errors are easy to diagnose.
@@ skipping 100 matching lines @@
   except subprocess.CalledProcessError as e:
     print >> sys.stderr, str(e)
     return 1
   return 0
 
 
 def build_gn_with_ninja_manually(tempdir, options):
   root_gen_dir = os.path.join(tempdir, 'gen')
   mkdir_p(root_gen_dir)
 
-  if is_linux:
+  if is_posix:

[brettw, 2016/04/20 17:21:45]

Actually I think this file should always be generated. We don't currently use it
on Windows I guess, but that seems incidental. Can you just delete the "if" line
and un-dent the block?

     mkdir_p(os.path.join(root_gen_dir, 'base', 'allocator'))
     with tempfile.NamedTemporaryFile() as f:
-      f.write('--flags USE_EXPERIMENTAL_ALLOCATOR_SHIM=true')
+      f.write('--flags USE_EXPERIMENTAL_ALLOCATOR_SHIM=%s'
+              % ('true' if is_linux else 'false'))
       f.flush()
 
       check_call([
           os.path.join(SRC_ROOT, 'build', 'write_buildflag_header.py'),
           '--output', 'base/allocator/features.h',
           '--gen-dir', root_gen_dir,
           '--definitions', f.name,
       ])
 
   if is_mac:
@@ skipping 56 matching lines @@
       continue
     full_path = os.path.join(GN_ROOT, name)
     static_libraries['gn']['sources'].append(
         os.path.relpath(full_path, SRC_ROOT))
 
   static_libraries['dynamic_annotations']['sources'].extend([
       'base/third_party/dynamic_annotations/dynamic_annotations.c',
       'base/third_party/superfasthash/superfasthash.c',
   ])
   static_libraries['base']['sources'].extend([
+      'base/allocator/allocator_check.cc',
       'base/allocator/allocator_extension.cc',
-      'base/allocator/allocator_shim.cc',
       'base/at_exit.cc',
       'base/base_paths.cc',
       'base/base_switches.cc',
       'base/callback_internal.cc',
       'base/command_line.cc',
       'base/debug/alias.cc',
       'base/debug/stack_trace.cc',
       'base/debug/task_annotator.cc',
       'base/environment.cc',
       'base/files/file.cc',
@@ skipping 165 matching lines @@
     libs.extend(['-lrt'])
     ldflags.extend(['-pthread'])
 
     static_libraries['xdg_user_dirs'] = {
         'sources': [
             'base/third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
         ],
         'tool': 'cxx',
     }
     static_libraries['base']['sources'].extend([
+        'base/allocator/allocator_shim.cc',
         'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
         'base/memory/shared_memory_posix.cc',
         'base/nix/xdg_util.cc',
         'base/process/internal_linux.cc',
         'base/process/process_handle_linux.cc',
         'base/process/process_iterator_linux.cc',
         'base/process/process_linux.cc',
         'base/process/process_metrics_linux.cc',
         'base/strings/sys_string_conversions_posix.cc',
         'base/sys_info_linux.cc',
@@ skipping 114 matching lines @@
     cmd.append('-v')
   cmd.append('gn')
   check_call(cmd)
 
   if not options.debug:
     check_call(['strip', os.path.join(build_dir, 'gn')])
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))