Revert of PPC/s390: [sysroot installer] Disable for host arch PPC/s390

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 90 matching lines @@
   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 == 'arm64':
     return 'arm64'
   elif detected_host_arch == 'mips':
     return 'mips'
-  elif detected_host_arch == 'ppc':
-    return 'ppc'
-  elif detected_host_arch == 's390':
-    return 's390'
 
   raise Error('Unrecognized host arch: %s' % detected_host_arch)
 
 
 def DetectTargetArch():
   """Attempt for determine target architecture.
 
   This works by looking for target_arch in GYP_DEFINES.
   """
   # TODO(agrieve): Make this script not depend on GYP_DEFINES so that it works
@@ skipping 50 matching lines @@
 
 
 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)
-  host_arch = DetectHostArch()
   if options.running_as_hook and not sys.platform.startswith('linux'):
     return 0
 
-  # PPC/s390 don't use sysroot, see http://crbug.com/646169
-  if host_arch in ('ppc','s390'):
-    return 0
-
   if options.running_as_hook:
     InstallDefaultSysroots()
   else:
     if not options.arch:
       print 'You much specify either --arch or --running-as-hook'
       return 1
     InstallDefaultSysrootForArch(options.arch)
 
   return 0
 
@@ skipping 56 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)