Revert 236542 "Run GN as part of runhooks."

trunk/src/build/gyp_chromium

 #!/usr/bin/env python
 
 # Copyright (c) 2012 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 script is wrapper for Chromium that adds some support for how GYP
 # is invoked by Chromium beyond what can be done in the gclient hooks.
 
 import glob
 import gyp_helper
 import os
 import shlex
 import subprocess
 import sys
 
 script_dir = os.path.dirname(os.path.realpath(__file__))
 chrome_src = os.path.abspath(os.path.join(script_dir, os.pardir))
 
 sys.path.insert(0, os.path.join(chrome_src, 'tools', 'gyp', 'pylib'))
 import gyp
 
-# Assume this file is in a one-level-deep subdirectory of the source root.
-SRC_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
 # Add paths so that pymod_do_main(...) can import files.
 sys.path.insert(1, os.path.join(chrome_src, 'tools', 'generate_shim_headers'))
 sys.path.insert(1, os.path.join(chrome_src, 'tools', 'grit'))
 sys.path.insert(1, os.path.join(chrome_src, 'chrome', 'tools', 'build'))
 sys.path.insert(1, os.path.join(chrome_src, 'native_client', 'build'))
 sys.path.insert(1, os.path.join(chrome_src, 'native_client_sdk', 'src',
     'build_tools'))
 sys.path.insert(1, os.path.join(chrome_src, 'remoting', 'tools', 'build'))
 sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit',
     'Source', 'build', 'scripts'))
@@ skipping 10 matching lines @@
 # may not be worth it).
 if sys.platform == 'win32':
   try:
     sys.path.insert(0, os.path.join(chrome_src, 'third_party', 'psyco_win32'))
     import psyco
   except:
     psyco = None
 else:
   psyco = None
 
-
 def additional_include_files(args=[]):
   """
   Returns a list of additional (.gypi) files to include, without
   duplicating ones that are already specified on the command line.
   """
   # Determine the include files specified on the command line.
   # This doesn't cover all the different option formats you can use,
   # but it's mainly intended to avoid duplicating flags on the automatic
   # makefile regeneration which only uses this format.
   specified_includes = set()
   for arg in args:
     if arg.startswith('-I') and len(arg) > 2:
       specified_includes.add(os.path.realpath(arg[2:]))
 
   result = []
   def AddInclude(path):
     if os.path.realpath(path) not in specified_includes:
       result.append(path)
 
   # Always include common.gypi.
   AddInclude(os.path.join(script_dir, 'common.gypi'))
 
   # Optionally add supplemental .gypi files if present.
   supplements = glob.glob(os.path.join(chrome_src, '*', 'supplement.gypi'))
   for supplement in supplements:
     AddInclude(supplement)
 
   return result
 
-
-def RunGN():
-  """Runs GN, returning True if it succeeded, printing an error and returning
-  false if not."""
-  # The binaries in platform-specific subdirectories in src/tools/gn/bin.
-  gnpath = SRC_DIR + '/tools/gn/bin/'
-  if sys.platform == 'win32':
-    gnpath += 'win/gn.exe'
-  elif sys.platform.startswith('linux'):
-    gnpath += 'linux/gn'
-  elif sys.platform == 'darwin':
-    gnpath += 'mac/gn'
-  else:
-    print 'Unknown platform for GN: ', sys.platform
-    return False
-
-  print 'Generating gyp files from GN...'
-  print 'platform = ', sys.platform
-  print 'binary = ', gnpath
-
-  # Need to pass both the source root (the bots don't run this command from
-  # within the source tree) as well as set the is_gyp value so the BUILD files
-  # to know they're being run under GYP.
-  args = [gnpath, 'gyp', '-q', '--root=' + chrome_src, '--args=is_gyp=true']
-  return subprocess.call(args) == 0
-
-
 if __name__ == '__main__':
   args = sys.argv[1:]
 
   if int(os.environ.get('GYP_CHROMIUM_NO_ACTION', 0)):
     print 'Skipping gyp_chromium due to GYP_CHROMIUM_NO_ACTION env var.'
     sys.exit(0)
 
   # Use the Psyco JIT if available.
   if psyco:
     psyco.profile()
     print "Enabled Psyco JIT."
 
-  if not RunGN():
-    sys.exit(1)
-
   # Fall back on hermetic python if we happen to get run under cygwin.
   # TODO(bradnelson): take this out once this issue is fixed:
   #    http://code.google.com/p/gyp/issues/detail?id=177
   if sys.platform == 'cygwin':
     python_dir = os.path.join(chrome_src, 'third_party', 'python_26')
     env = os.environ.copy()
     env['PATH'] = python_dir + os.pathsep + env.get('PATH', '')
     p = subprocess.Popen(
        [os.path.join(python_dir, 'python.exe')] + sys.argv,
        env=env, shell=False)
@@ skipping 50 matching lines @@
   # to enfore syntax checking.
   syntax_check = os.environ.get('CHROMIUM_GYP_SYNTAX_CHECK')
   if syntax_check and int(syntax_check):
     args.append('--check')
 
   print 'Updating projects from gyp files...'
   sys.stdout.flush()
 
   # Off we go...
   sys.exit(gyp.main(args))