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 13 matching lines @@
 import subprocess
 import sys
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 sys.path.append(os.path.dirname(os.path.dirname(os.path.join(SCRIPT_DIR))))
 import detect_host_arch
 import gyp_chromium
 import gyp_environment
 
 
+# Its existence signifies an Android checkout.
+ANDROID_ONLY_DIR = os.path.join(SCRIPT_DIR, os.pardir, os.pardir, os.pardir,
+                                'third_party', 'android_tools')
+
 URL_PREFIX = 'http://storage.googleapis.com'
 URL_PATH = 'chrome-linux-sysroot/toolchain'
 REVISION_AMD64 = '402274e42cb72fde4f48a4bb01664d0ad4533c69'
 REVISION_ARM = '402274e42cb72fde4f48a4bb01664d0ad4533c69'
 REVISION_I386 = '402274e42cb72fde4f48a4bb01664d0ad4533c69'
 REVISION_MIPS = '402274e42cb72fde4f48a4bb01664d0ad4533c69'
 TARBALL_AMD64 = 'debian_wheezy_amd64_sysroot.tgz'
 TARBALL_ARM = 'debian_wheezy_arm_sysroot.tgz'
 TARBALL_I386 = 'debian_wheezy_i386_sysroot.tgz'
 TARBALL_MIPS = 'debian_wheezy_mips_sysroot.tgz'
@@ skipping 14 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): Make this script not depend on GYP_DEFINES so that it works
+  #     with GN as well.
   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 is_android:
-    # 32-bit Android builds require a 32-bit host sysroot for the v8 snapshot.
-    if '64' not in target_arch:
+    if os.path.exists(ANDROID_ONLY_DIR):

[Dirk Pranke, 2015/12/04 00:55:08]

nit: I'd change line 119 to 'elif os.path.exist(...) and dedent lines 121-123
and 128-132.

[agrieve, 2015/12/04 15:26:54]

Done.

+      # 32-bit Android builds (the default for target_os="android") require a
+      # 32-bit host sysroot for the v8 snapshot, and a 64-bit sysroot for host
+      # tools.
       ret = _InstallSysroot('i386')
       if ret:
         return ret
-    # Always need host sysroot (which we assume is x64).
-    target_arch = 'amd64'
+      target_arch = 'amd64'
+    else:
+      target_arch = DetectArch(gyp_defines)
+      if not target_arch:
+        print 'Unable to detect target architecture'
+        return 1
 
   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())