Enable whitelist generation for all builds.

build/toolchain/gcc_ar_wrapper.py

 #!/usr/bin/env python
-# Copyright 2015 The Chromium Authors. All rights reserved.
+# Copyright 2016 The Chromium Authors. All rights reserved.

[agrieve, 2016/07/27 01:42:27]

These actually shouldn't be updated. They are meant to reflect the earliest
copyright on the file.

[estevenson, 2016/07/28 21:56:45]

Done.

 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Runs the 'ar' command after removing its output file first.
 
 This script is invoked like:
   python gcc_ar_wrapper.py --ar=$AR --output=$OUT $OP $INPUTS
 to do the equivalent of:
   rm -f $OUT && $AR $OP $OUT $INPUTS
 """
 
 import argparse
 import os
 import subprocess
 import sys
 
-
-# When running on a Windows host and using a toolchain whose tools are
-# actually wrapper scripts (i.e. .bat files on Windows) rather than binary
-# executables, the "command" to run has to be prefixed with this magic.
-# The GN toolchain definitions take care of that for when GN/Ninja is
-# running the tool directly.  When that command is passed in to this
-# script, it appears as a unitary string but needs to be split up so that
-# just 'cmd' is the actual command given to Python's subprocess module.
-BAT_PREFIX = 'cmd /c call '
-
-def CommandToRun(command):
-  if command[0].startswith(BAT_PREFIX):
-    command = command[0].split(None, 3) + command[1:]
-  return command
+import wrapper_utils
 
 
 def main():
   parser = argparse.ArgumentParser(description=__doc__)
   parser.add_argument('--ar',
                       required=True,
                       help='The ar binary to run',
                       metavar='PATH')
   parser.add_argument('--output',
                       required=True,
                       help='Output archive file',
                       metavar='ARCHIVE')
   parser.add_argument('--plugin',
                       help='Load plugin')
   parser.add_argument('operation',
                       help='Operation on the archive')
   parser.add_argument('inputs', nargs='+',
                       help='Input files')
+  parser.add_argument('--rspfile',
+                      help='Response file',

[agrieve, 2016/07/27 01:42:27]

nit: response file is already passed as a positional arg, so probably no need to
pass it explicitly here.

E.g.: rsp_files = [a for a in args.inputs if a.startswith('@')]

[estevenson, 2016/07/28 21:56:45]

Done.

+                      metavar='FILE')
+  parser.add_argument('--whitelist', action='store_true',
+                      help='Indicates that whitelisting should be performed.')

[agrieve, 2016/07/27 01:42:27]

It's probably not obvious to most what "whitelisting" refers to. How about:

help='Merge all resource whitelists into a single whitelist'

[estevenson, 2016/07/28 21:56:45]

Done.

   args = parser.parse_args()
 
+  if args.whitelist:
+    whitelist_file = '%s.whitelist' % args.output

[agrieve, 2016/07/27 01:42:27]

nit: For compiler wrapper you pass in the path to the output. Probably makes
sense to do so here as well. May also make sense to have
--resource-whitelist=PATH in place of a boolean flag.

[estevenson, 2016/07/28 21:56:45]

Done.

+    wrapper_utils.CombineWhitelists(args.rspfile, whitelist_file)
+
   command = [args.ar, args.operation]
   if args.plugin is not None:
+

[agrieve, 2016/07/27 01:42:27]

nit: revert

[estevenson, 2016/07/28 21:56:45]

Done.

     command += ['--plugin', args.plugin]
   command.append(args.output)
   command += args.inputs
 
   # Remove the output file first.
   try:
     os.remove(args.output)
   except OSError as e:
     if e.errno != os.errno.ENOENT:
       raise
 
   # Now just run the ar command.
-  return subprocess.call(CommandToRun(command))
+  return subprocess.call(wrapper_utils.CommandToRun(command))
 
 
 if __name__ == "__main__":
   sys.exit(main())