Revert of "Update linux sysroot from Wheezy to Jessie"

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 that get built will run on
-# the oldest stable version of Debian that we currently support.
-# This script can be run manually but is more often run as part of gclient
-# hooks. When run from hooks this script is a no-op on non-linux platforms.
+# The sysroot is needed to ensure that binaries will run on Debian Wheezy,
+# the oldest supported linux distribution. For ARM64 linux, we have Debian
+# Jessie sysroot as Jessie is the first version with ARM64 support. This script
+# can be run manually but is more often run as part of gclient hooks. When run
+# from hooks this script is a no-op on non-linux platforms.
 
-# The sysroot image could be constructed from scratch based on the current state
-# of the Debian archive but for consistency we use a pre-built root image (we
-# don't want upstream changes to Debian to effect the chromium build until we
-# choose to pull them in). The images will normally need to be rebuilt every
-# time chrome's build dependencies are changed but should also be updated
-# periodically to include upstream security fixes from Debian.
+# The sysroot image could be constructed from scratch based on the current
+# state or Debian Wheezy/Jessie but for consistency we currently use a
+# pre-built root image. The image will normally need to be rebuilt every time
+# chrome's build dependencies are changed.
 
 import hashlib
 import json
 import platform
 import optparse
 import os
 import re
 import shutil
 import subprocess
 import sys
@@ skipping 98 matching lines @@
   # available.
   InstallSysroot('Precise', 'amd64')
 
   # If we can detect a non-standard target_arch such as ARM or MIPS,
   # then install the sysroot too.  Don't attempt to install arm64
   # 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 gyp_defines.get('use_ozone') == '1':
+    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))
-  parser.add_option('--all', action='store_true',
-                    help='Install all sysroot images (useful when updating the'
-                         ' images)')
   options, _ = parser.parse_args(args)
   if options.running_as_hook and not sys.platform.startswith('linux'):
     return 0
 
   if options.running_as_hook:
     host_arch = DetectHostArch()
     # PPC/s390 don't use sysroot, see http://crbug.com/646169
     if host_arch in ['ppc','s390']:
       return 0
     InstallDefaultSysroots(host_arch)
-  elif options.arch:
+  else:
+    if not options.arch:
+      print 'You much specify either --arch or --running-as-hook'
+      return 1
     InstallDefaultSysrootForArch(options.arch)
-  elif options.all:
-    for arch in VALID_ARCHS:
-      InstallDefaultSysrootForArch(arch)
-  else:
-    print 'You much specify either --arch, --all or --running-as-hook'
-    return 1
 
   return 0
 
-
 def InstallDefaultSysrootForArch(target_arch):
-  if target_arch not in VALID_ARCHS:
+  if target_arch == 'amd64':
+    InstallSysroot('Wheezy', 'amd64')
+  elif target_arch == 'arm':
+    InstallSysroot('Wheezy', 'arm')
+  elif target_arch == 'arm64':
+    InstallSysroot('Jessie', 'arm64')
+  elif target_arch == 'i386':
+    InstallSysroot('Wheezy', 'i386')
+  elif target_arch == 'mips':
+    InstallSysroot('Wheezy', 'mips')
+  else:
     raise Error('Unknown architecture: %s' % target_arch)
-  InstallSysroot('Jessie', target_arch)
-
 
 def InstallSysroot(target_platform, target_arch):
   # The sysroot directory should match the one specified in build/common.gypi.
   # TODO(thestig) Consider putting this elsewhere to avoid having to recreate
   # it on every build.
   linux_dir = os.path.dirname(SCRIPT_DIR)
 
   sysroots_file = os.path.join(SCRIPT_DIR, 'sysroots.json')
   sysroots = json.load(open(sysroots_file))
   sysroot_key = '%s_%s' % (target_platform.lower(), target_arch)
@@ skipping 44 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)