GN: Add an assert that sysroot exists

build/linux/sysroot_scripts/install-sysroot.py

Index: build/linux/sysroot_scripts/install-sysroot.py
diff --git a/build/linux/sysroot_scripts/install-sysroot.py b/build/linux/sysroot_scripts/install-sysroot.py
index e922cb7a9f33ed3b0459b7b8c83f32f97c0ca6af..8d2599325cf88f48709770299e6fc0da1e8b4fa2 100755
--- a/build/linux/sysroot_scripts/install-sysroot.py
+++ b/build/linux/sysroot_scripts/install-sysroot.py
@@ -50,7 +50,12 @@ 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):
@@ -117,7 +122,7 @@ def main():
     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: