GN bootstrap fixes:

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.
 
 """Bootstraps gn.
 
 It is done by first building it manually in a temporary directory, then building
 it with its own BUILD.gn to the final destination.
 """
@@ skipping 47 matching lines @@
   print 'Building gn manually in a temporary directory for bootstrapping...'
   build_gn_with_ninja_manually(tempdir, options)
   temp_gn = os.path.join(tempdir, 'gn')
   out_gn = os.path.join(build_root, 'gn')
 
   if options.no_rebuild:
     mkdir_p(build_root)
     shutil.copy2(temp_gn, out_gn)
   else:
     print 'Building gn using itself to %s...' % build_rel
-    build_gn_with_gn(temp_gn, build_rel, options)
+    build_gn_with_gn(temp_gn, build_root, options)
 
   if options.output:
     # Preserve the executable permission bit.
     shutil.copy2(out_gn, options.output)
 
 
 def main(argv):
   parser = optparse.OptionParser(description=sys.modules[__name__].__doc__)
   parser.add_option('-d', '--debug', action='store_true',
                     help='Do a debug build. Defaults to release build.')
@@ skipping 70 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_extension_thunks.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 275 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:]))