Reland of Use sysroot by default for all linux builds

build/linux/sysroot_scripts/install-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 85 matching lines @@
   elif detected_host_arch == 'arm':
     return 'arm'
   elif detected_host_arch == 'mips':
     return 'mips'
   else:
     print "Unknown host arch: %s" % detected_host_arch
 
   return None
 
 
-def UsingSysroot(target_arch, is_android, gyp_defines):
-  # ChromeOS uses a chroot, so doesn't need a sysroot
-  if gyp_defines.get('chromeos'):
-    return False
-
-  # When cross-compiling non-Android builds we always use a sysroot
-  if not is_android and target_arch in ('arm', 'mips', 'i386'):
-    return True
-
-  # Setting use_sysroot=1 GYP_DEFINES forces the use of the sysroot even
-  # when not cross compiling
-  if gyp_defines.get('use_sysroot'):
-    return True
-
-  # Official builds always use the sysroot.
-  if (gyp_defines.get('branding') == 'Chrome' and
-      gyp_defines.get('buildtype') == 'Official'):
-    return True
-
-  return False
-
-
 def main():
   if options.running_as_hook and not sys.platform.startswith('linux'):
     return 0
 
   gyp_environment.SetEnvironment()
   supplemental_includes = gyp_chromium.GetSupplementalFiles()
   gyp_defines = gyp_chromium.GetGypVars(supplemental_includes)
   is_android = gyp_defines.get('OS') == 'android'
 
+  if (options.running_as_hook and (not is_android) and
+      (gyp_defines.get('chromeos') or gyp_defines.get('use_sysroot') == '0')):
+    return 0
+
   if options.arch:
     target_arch = options.arch
   else:
     target_arch = DetectArch(gyp_defines, is_android)
     if not target_arch:
       print 'Unable to detect target architecture'
       return 1
 
-  if (options.running_as_hook and
-      not UsingSysroot(target_arch, is_android, gyp_defines)):
-    return 0
-
   if is_android:
     # 32-bit Android builds require a 32-bit host sysroot for the v8 snapshot.
     if '64' not in target_arch:
       ret = _InstallSysroot('i386')
       if ret:
         return ret
     # Always need host sysroot (which we assume is x64).
     target_arch = 'amd64'
 
   return _InstallSysroot(target_arch)
@@ skipping 64 matching lines @@
   parser = optparse.OptionParser('usage: %prog [OPTIONS]')
   parser.add_option('--running-as-hook', action='store_true',
                     default=False, help='Used when running from gclient hooks.'
                                         ' In this mode the sysroot will only '
                                         'be installed for official Linux '
                                         'builds or ARM 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())