Makes --analyzer behave same as --analyzer2

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
@@ skipping 172 matching lines @@
   for supplement in supplemental_files:
     AddInclude(supplement)
 
   return result
 
 
 if __name__ == '__main__':
   args = sys.argv[1:]
 
   # TODO(sky): remove analyzer2 once updated recipes.
-  use_analyzer = len(args) and args[0] == '--analyzer'
+  use_analyzer = len(args) and (args[0] == '--analyzer' or
+                                args[0] == '--analyzer2')
   if use_analyzer:
     args.pop(0)
     os.environ['GYP_GENERATORS'] = 'analyzer'
-    args.append('-Gfile_path=' + args.pop(0))
-  elif len(args) and args[0] == '--analyzer2':
-    use_analyzer = True
-    args.pop(0)
-    os.environ['GYP_GENERATORS'] = 'analyzer'
     args.append('-Gconfig_path=' + args.pop(0))
     args.append('-Ganalyzer_output_path=' + args.pop(0))

[Nico, 2014/08/07 21:37:09]

lgtm assuming args always has at least 2 elements in both analyzer and analyzer2
mode

 
   if int(os.environ.get('GYP_CHROMIUM_NO_ACTION', 0)):
     # Check for landmines (reasons to clobber the build) in any case.
     print 'Running build/landmines.py...'
     subprocess.check_call(
         [sys.executable, os.path.join(script_dir, 'landmines.py')])
     print 'Skipping gyp_chromium due to GYP_CHROMIUM_NO_ACTION env var.'
     sys.exit(0)
 
   # Use the Psyco JIT if available.
@@ skipping 121 matching lines @@
     subprocess.check_call(
       [sys.executable, os.path.join(script_dir, 'landmines.py')])
 
     if vs2013_runtime_dll_dirs:
       x64_runtime, x86_runtime = vs2013_runtime_dll_dirs
       vs_toolchain.CopyVsRuntimeDlls(
         os.path.join(chrome_src, GetOutputDirectory()),
         (x86_runtime, x64_runtime))
 
   sys.exit(gyp_rc)