Download Jessie sysroot on ozone 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.
 
 """Install Debian sysroots for building chromium.
 """
 
 # The sysroot is needed to ensure that binaries will run on Debian Wheezy,
 # the oldest supported linux distribution. For ARM64 linux, we have Debian
@@ skipping 109 matching lines @@
 
   if host_arch == 'amd64':
     InstallDefaultSysrootForArch('i386')
 
   # Desktop Chromium OS builds require the precise sysroot.
   # TODO(thomasanderson): only download this when the GN arg target_os
   # == 'chromeos', when the functionality to perform the check becomes
   # available.
   InstallSysroot('Precise', 'amd64')
 
-  # Finally, if we can detect a non-standard target_arch such as ARM or
-  # MIPS, then install the sysroot too.
-  # Don't attampt to install arm64 since this is currently and android-only
-  # architecture.
+  # If we can detect a non-standard target_arch such as ARM or MIPS,
+  # then install the sysroot too.  Don't attampt to install arm64

[Dirk Pranke, 2017/01/23 22:39:53]

Nit: s/attampt/attempt

[Tom (Use chromium acct), 2017/01/24 01:30:00]

Done.

+  # since this is currently and android-only architecture.
   target_arch = DetectTargetArch()
   if target_arch and target_arch not in (host_arch, 'i386'):
     InstallDefaultSysrootForArch(target_arch)
 
+  # Desktop Linux ozone builds require libxkbcommon* which is not
+  # available in Wheezy.
+  # TODO(thomasanderson): Remove this once the Jessie sysroot is used
+  # by default.
+  gyp_defines = gyp_chromium.GetGypVars(gyp_chromium.GetSupplementalFiles())
+  if 'use_ozone' in gyp_defines and gyp_defines['use_ozone'] == '1':

[Dirk Pranke, 2017/01/23 22:39:53]

Nit: 

   if gyp_defines.get('use_ozone') == '1':

[Tom (Use chromium acct), 2017/01/24 01:30:00]

Done.

+    InstallSysroot('Jessie', 'amd64')
+
 
 def main(args):
   parser = optparse.OptionParser('usage: %prog [OPTIONS]', description=__doc__)
   parser.add_option('--running-as-hook', action='store_true',
                     default=False, help='Used when running from gclient hooks.'
                                         ' Installs default sysroot images.')
   parser.add_option('--arch', type='choice', choices=VALID_ARCHS,
                     help='Sysroot architecture: %s' % ', '.join(VALID_ARCHS))
   options, _ = parser.parse_args(args)
   if options.running_as_hook and not sys.platform.startswith('linux'):
@@ skipping 43 matching lines @@
   tarball_filename = sysroot_dict['Tarball']
   tarball_sha1sum = sysroot_dict['Sha1Sum']
   sysroot = os.path.join(linux_dir, sysroot_dict['SysrootDir'])
 
   url = '%s/%s/%s/%s' % (URL_PREFIX, URL_PATH, revision, tarball_filename)
 
   stamp = os.path.join(sysroot, '.stamp')
   if os.path.exists(stamp):
     with open(stamp) as s:
       if s.read() == url:
-        print 'Debian %s %s root image already up to date: %s' % \
+        print '%s %s sysroot image already up to date: %s' % \
             (target_platform, target_arch, sysroot)
         return
 
   print 'Installing Debian %s %s root image: %s' % \
       (target_platform, target_arch, sysroot)
   if os.path.isdir(sysroot):
     shutil.rmtree(sysroot)
   os.mkdir(sysroot)
   tarball = os.path.join(sysroot, tarball_filename)
   print 'Downloading %s' % url
@@ skipping 19 matching lines @@
   with open(stamp, 'w') as s:
     s.write(url)
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except Error as e:
     sys.stderr.write(str(e) + '\n')
     sys.exit(1)