Add --running-as-hooks argument to install-debian.wheezy.sysroot.py

chrome/installer/linux/sysroot_scripts/install-debian.wheezy.sysroot.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
 # Script to install a Debian Wheezy sysroot for making official Google Chrome
 # Linux builds.
 # The sysroot is needed to make Chrome work for Debian Wheezy.
 # This script can be run manually but is more often run as part of gclient
 # hooks. When run from hooks this script should be a no-op on non-linux
@@ skipping 70 matching lines @@
     return 'i386'
   elif detected_host_arch == 'arm':
     return 'arm'
   else:
     print "Unknown host arch: %s" % detected_host_arch
 
   return None
 
 
 def main():
-  if options.linux_only:
-    # This argument is passed when run from the gclient hooks.
-    # In this case we return early on non-linux platforms.
-    if not sys.platform.startswith('linux'):
-      return 0
+  if options.running_as_hook and not sys.platform.startswith('linux'):
+    return 0
 
   gyp_defines = os.environ.get('GYP_DEFINES', '')
 
   if options.arch:
     target_arch = options.arch
   else:
     target_arch = DetectArch(gyp_defines)
     if not target_arch:
       print 'Unable to detect host architecture'
       return 1
 
-  if options.linux_only and target_arch != 'arm':
+  if options.running_as_hook and target_arch != 'arm' :

[Lei Zhang, 2015/05/13 01:04:48]

nit: extra space?

[Sam Clegg, 2015/05/13 01:13:23]

Done.

     # When run from runhooks, only install the sysroot for an Official Chrome
     # Linux build, except on ARM where we always use a sysroot.
-    defined = ['branding=Chrome', 'buildtype=Official']
-    undefined = ['chromeos=1']
-    for option in defined:
+    skip_if_defined = ['branding=Chrome', 'buildtype=Official']
+    skip_if_undefined = ['chromeos=1']
+    for option in skip_if_defined:
       if option not in gyp_defines:
         return 0
-    for option in undefined:
+    for option in skip_if_undefined:
       if option in gyp_defines:
         return 0
 
   # The sysroot directory should match the one specified in build/common.gypi.
   # TODO(thestig) Consider putting this else where to avoid having to recreate
   # it on every build.
   linux_dir = os.path.dirname(SCRIPT_DIR)
   if target_arch == 'amd64':
     sysroot = os.path.join(linux_dir, SYSROOT_DIR_AMD64)
     tarball_filename = TARBALL_AMD64
@@ skipping 40 matching lines @@
   subprocess.check_call(['tar', 'xf', tarball, '-C', sysroot])
   os.remove(tarball)
 
   with open(stamp, 'w') as s:
     s.write(url)
   return 0
 
 
 if __name__ == '__main__':
   parser = optparse.OptionParser('usage: %prog [OPTIONS]')
-  parser.add_option('--linux-only', action='store_true',
+  parser.add_option('--running-as-hook', action='store_true',
                     default=False, help='Only install sysroot for official '

[Lei Zhang, 2015/05/13 01:04:48]

Update the help msg?

[Sam Clegg, 2015/05/13 01:13:23]

Done.

                                         'Linux builds')
   parser.add_option('--arch', type='choice', choices=valid_archs,
                     help='Sysroot architecture: %s' % ', '.join(valid_archs))
   options, _ = parser.parse_args()
   sys.exit(main())