Fix merge problems in r38573, a cleanup of build scripts.

tools/dom/scripts/dartdomgenerator.py

 #!/usr/bin/python
 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 """This is the entry point to create Dart APIs from the IDL database."""
 
 import dartgenerator
 import database
 import fremontcutbuilder
@@ skipping 182 matching lines @@
                     default=False,
                     help='''Update the metadata list of DOM APIs''')
   (options, args) = parser.parse_args()
 
   current_dir = os.path.dirname(__file__)
   database_dir = os.path.join(current_dir, '..', 'database')
   logging.config.fileConfig(os.path.join(current_dir, 'logging.conf'))
   systems = options.systems.split(',')
 
   output_dir = options.output_dir or os.path.join(
-      current_dir, '..', '..', utils.GetBuildDir(utils.GuessOS(), None),
+      current_dir, '..', '..', utils.GetBuildDir(utils.GuessOS()),
       'generated')
 
   dart2js_output_dir = None
   if 'htmldart2js' in systems:
     dart2js_output_dir = os.path.join(output_dir, 'dart2js')
   dartium_output_dir = None
   if 'htmldartium' in systems:
     dartium_output_dir = os.path.join(output_dir, 'dartium')
 
   if options.rebuild:
@@ skipping 16 matching lines @@
     for library_name in HTML_LIBRARY_NAMES:
       GenerateSingleFile(
           os.path.join(dartium_output_dir, '%s_dartium.dart' % library_name),
           os.path.join('..', '..', '..', 'sdk', 'lib', library_name, 'dartium'))
     GenerateSingleFile(
         os.path.join(dartium_output_dir, '_blink_dartium.dart'),
         os.path.join('..', '..', '..', 'sdk', 'lib', '_blink', 'dartium'))
 
 if __name__ == '__main__':
   sys.exit(main())