GN: Add an assert that sysroot exists

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 32 matching lines @@
 TARBALL_MIPS = 'debian_wheezy_mips_sysroot.tgz'
 TARBALL_AMD64_SHA1SUM = '546f211d47a6544994bb6f7cf9800c3a73a12d3a'
 TARBALL_ARM_SHA1SUM = '457ee7165526846a8bef08f64c58db994481f159'
 TARBALL_I386_SHA1SUM = '8d00eb9e60009ec23e7cb47c6ecbcf85b319e09e'
 TARBALL_MIPS_SHA1SUM = '358d8fe133575c41354fa7fe5d9c591d199f6033'
 SYSROOT_DIR_AMD64 = 'debian_wheezy_amd64-sysroot'
 SYSROOT_DIR_ARM = 'debian_wheezy_arm-sysroot'
 SYSROOT_DIR_I386 = 'debian_wheezy_i386-sysroot'
 SYSROOT_DIR_MIPS = 'debian_wheezy_mips-sysroot'
 
-valid_archs = ('arm', 'i386', 'amd64', 'mips')
+ARCH_MAP = {
+    'x86': 'i386',
+    'x64': 'amd64'
+}
+
+valid_archs = ['arm', 'i386', 'amd64', 'mips'] + ARCH_MAP.keys()

[Dirk Pranke, 2015/12/02 22:55:44]

why do we need to support both 'i386' and 'x86' ? Can we just require users to
pass in 'x86' or 'x64' instead?

[agrieve, 2015/12/03 01:49:29]

I didn't want to have to apply the mapping within the GN assert(). My lame
reasoning:  I'd need to use a variable to do so, and since it's a .gni file, it
would leak into including files.

Added a comment saying that it's for accepting GN target_cpu values.

 
 
 def GetSha1(filename):
   sha1 = hashlib.sha1()
   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
@@ skipping 46 matching lines @@
   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
+    target_arch = ARCH_MAP.get(options.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:
       ret = _InstallSysroot('i386')
@@ skipping 70 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())