Sysroot: Add build_and_upload.py

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 109d5532b518bcbdfa96d44de4b395bcf6ba1898..409cd69a0a2a16483e594c680c5ab499c7b49284 100755
--- a/build/linux/sysroot_scripts/install-sysroot.py
+++ b/build/linux/sysroot_scripts/install-sysroot.py
@@ -18,6 +18,7 @@
 # chrome's build dependencies are changed.
 
 import hashlib
+import json
 import platform
 import optparse
 import os
@@ -37,46 +38,7 @@ import gyp_environment
 URL_PREFIX = 'https://commondatastorage.googleapis.com'
 URL_PATH = 'chrome-linux-sysroot/toolchain'
 
-SYSROOTS = {
-    ('Wheezy', 'amd64'): {
-        'Revision' : '7d200a1ddfeb50dbf9f7e2c1c4ff1080679edf02',
-        'Tarball' : 'debian_wheezy_amd64_sysroot.tgz',
-        'Sha1Sum' : 'cc43f16c817fbb8c525405363ece863347210a30',
-        'SysrootDir' : 'debian_wheezy_amd64-sysroot'
-    },
-    ('Wheezy', 'arm'): {
-        'Revision' : '7d200a1ddfeb50dbf9f7e2c1c4ff1080679edf02',
-        'Tarball' : 'debian_wheezy_arm_sysroot.tgz',
-        'Sha1Sum' : 'c09ac9576642d81209f25cde19a64f427b5fbaf8',
-        'SysrootDir' : 'debian_wheezy_arm-sysroot'
-    },
-    ('Wheezy', 'i386'): {
-        'Revision' : '7d200a1ddfeb50dbf9f7e2c1c4ff1080679edf02',
-        'Tarball' : 'debian_wheezy_i386_sysroot.tgz',
-        'Sha1Sum' : '1b28326d17094b9d3616579b988eb5554c3dc9f8',
-        'SysrootDir' : 'debian_wheezy_i386-sysroot'
-    },
-    ('Wheezy', 'mips'): {
-        'Revision' : '7d200a1ddfeb50dbf9f7e2c1c4ff1080679edf02',
-        'Tarball' : 'debian_wheezy_mips_sysroot.tgz',
-        'Sha1Sum' : 'c0948a2c955588079dc31d688e8105730744ef45',
-        'SysrootDir' : 'debian_wheezy_mips-sysroot'
-    },
-    ('Jessie', 'arm64'): {
-        'Revision' : '5735a5e9605d549acb6495e1fb65384a54fe0a48',
-        'Tarball' : 'debian_jessie_arm64_sysroot.tgz',
-        'Sha1Sum' : '82ebae900d0aadd52cf76a8e7cdb6a782df6ef28',
-        'SysrootDir' : 'debian_jessie_arm64-sysroot'
-    },
-    ('Precise', 'amd64'): {
-        'Revision' : '7d200a1ddfeb50dbf9f7e2c1c4ff1080679edf02',
-        'Tarball' : 'ubuntu_precise_amd64_sysroot.tgz',
-        'Sha1Sum' : 'fdf81c55a0c6decd44f07781ebf163f97deb26cc',
-        'SysrootDir' : 'ubuntu_precise_amd64-sysroot'
-    }
-}
-
-valid_archs = ('arm', 'arm64', 'i386', 'amd64', 'mips')
+VALID_ARCHS = ('arm', 'arm64', 'i386', 'amd64', 'mips')
 
 
 class Error(Exception):
@@ -179,8 +141,8 @@ def main(args):
   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('--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'):
     return 0
@@ -215,13 +177,14 @@ def InstallDefaultSysrootForArch(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 else where to avoid having to recreate
+  # TODO(thestig) Consider putting this elsewhere to avoid having to recreate
   # it on every build.
   linux_dir = os.path.dirname(SCRIPT_DIR)
 
-  if (target_platform, target_arch) not in SYSROOTS:
-    raise Error('No sysroot for: %s %s' % (target_platform, target_arch))
-  sysroot_dict = SYSROOTS[(target_platform, target_arch)]
+  sysroots_file = os.path.join(os.path.dirname(os.path.realpath(__file__)),

[Sam Clegg, 2016/12/12 22:11:52]

Use SCRIPT_DIR here?

[Tom (Use chromium acct), 2016/12/13 00:06:19]

Done.

+                               'sysroots.json')
+  sysroots = json.load(open(sysroots_file))
+  sysroot_dict = sysroots['%s_%s' % (target_platform.lower(), target_arch)]

[Sam Clegg, 2016/12/12 22:11:52]

Should see keep the error for the case when the key is not in the sysroots dict?

[Tom (Use chromium acct), 2016/12/13 00:06:19]

Oops, forgot about that.  Done

   revision = sysroot_dict['Revision']
   tarball_filename = sysroot_dict['Tarball']
   tarball_sha1sum = sysroot_dict['Sha1Sum']