Always install default host sysroots from gclient runhooks

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 47 matching lines @@
   with open(filename, 'rb') as f:
     while True:
       # Read in 1mb chunks, so it doesn't all have to be loaded into memory.
       chunk = f.read(1024*1024)
       if not chunk:
         break
       sha1.update(chunk)
   return sha1.hexdigest()
 
 
-def DetectArch(gyp_defines, is_android):
+def DetectArch(gyp_defines):
   # Check for optional target_arch and only install for that architecture.
   # If target_arch is not specified, then only install for the host
   # architecture.
   target_arch = gyp_defines.get('target_arch')
   if target_arch == 'x64':
     return 'amd64'
   elif target_arch == 'ia32':
     return 'i386'
   elif target_arch == 'arm':
     return 'arm'
   elif target_arch == 'arm64':
     return 'arm64'
   elif target_arch == 'mipsel':
     return 'mips'
   elif target_arch:
     raise Exception('Unrecognized target_arch: %s' % target_arch)
 
-  if is_android:
-    return 'arm'
-
   # Figure out host arch using build/detect_host_arch.py and
   # set target_arch to host arch
   detected_host_arch = detect_host_arch.HostArch()
   if detected_host_arch == 'x64':
     return 'amd64'
   elif detected_host_arch == 'ia32':
     return 'i386'
   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 main():
   if options.running_as_hook and not sys.platform.startswith('linux'):
     return 0
 
+  # TODO(agrieve): Stop using GYP_DEFINES and ensure bots that cross-compile
+  #     explicitly download sysroots.

[Dirk Pranke, 2015/12/02 23:09:22]

I don't think we want a bot-only solution, so this comment is not what 
I would write.

I would change the comment to something like TODO: make this not depend on 
GYP_DEFINES so that it works w/ GN as well.

[agrieve, 2015/12/03 02:06:24]

Done.

   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

[Sam Clegg, 2015/12/02 23:17:46]

Why not keep this early out?

[agrieve, 2015/12/03 02:06:24]

Because you might have built with both GYP and GN in the same checkout, and your
GN might require a sysroot while your GYP does not.

 
   if options.arch:
     target_arch = options.arch
   else:
-    target_arch = DetectArch(gyp_defines, is_android)
+    target_arch = DetectArch(gyp_defines)
     if not target_arch:
       print 'Unable to detect target architecture'
       return 1
 
-  if is_android:
-    # 32-bit Android builds require a 32-bit host sysroot for the v8 snapshot.
-    if '64' not in target_arch:
+    if target_arch == 'amd64':

[Sam Clegg, 2015/12/02 23:17:46]

Won't target_arch be 'arm' here for most android bots?

[Dirk Pranke, 2015/12/02 23:20:38]

Not necessarily. The bots don't have to set target_arch=arm, because that's the
default if os=android. Some might, some might not.

That said, we should probably make sure anyone that *does* set target_arch=arm
also still gets the host sysroots,
so I think you're actually right that this patch is in fact wrong.

[agrieve, 2015/12/03 02:06:24]

Reworked this to look for the presence of //third_party/android_tools instead.

+      # 32-bit Android builds (the default) require a 32-bit host sysroot for
+      # the v8 snapshot, and a 64-bit sysroot for host tools. Assume 'amd64'
+      # means default setup.

[Dirk Pranke, 2015/12/02 23:09:22]

I don't think it's really clear what "(the default)" means in this situation.
32-bit android builds are the default *android* build, but in no sense is an
android build the default build for linux hosts generally.

I would rewrite this comment to something along the lines of "we don't have a
good way as a gclient hook to figure out which of the sysroots we need, so
install both of them to make both desktop linux builds and android builds
happy".

[agrieve, 2015/12/03 02:06:24]

reworded.

       ret = _InstallSysroot('i386')
       if ret:
         return ret
-    # Always need host sysroot (which we assume is x64).
-    target_arch = 'amd64'
 
   return _InstallSysroot(target_arch)
 
 
 def _InstallSysroot(target_arch):
   # 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':
@@ skipping 56 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())