Move ARM64 bot back from stretch to sid

The ARM64 bot has been upgraded to 18.04, so the stretch sysroot is no
longer needed. This patch removes it. NOTE: this also includes removing
almost all of the platform targeting code, since we only have one
platform now they are dead code paths. Future developers should consider
referring to this patch if we ever have multiple flavors of sysroots at
the same time again.

TBR due to buildbucket change, and this is 100% code removal.
TBR=btolsch@chromium.org

Bug: openscreen/18
Change-Id: Ic85f54bb7467f1317776a3cea3a1878bc6caae58
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2147773
Reviewed-by: Jordan Bayles <jophba@chromium.org>
Commit-Queue: Jordan Bayles <jophba@chromium.org>

4 files changed, 7 insertions, 31 deletions

diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn
index 9745e3f0..52f0d6fb 100644
--- a/build/config/BUILD.gn
+++ b/build/config/BUILD.gn
@@ -233,7 +233,6 @@ config("sysroot_runtime_libraries") {
                        [
                          "--print-hash",
                          "$current_cpu",
-                         "$sysroot_platform",
                        ],
                        "trim string",
                        [ "//build/scripts/sysroots.json" ])
diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni
index c5f2d549..8ce9455a 100644
--- a/build/config/sysroot.gni
+++ b/build/config/sysroot.gni
@@ -12,30 +12,20 @@ declare_args() {
   target_sysroot_dir = "../"
 
   use_sysroot = current_cpu == "arm" || current_cpu == "arm64"
-
-  # By default, we pull the debian sid sysroot, however this can be configured.
-  sysroot_platform = "sid"
 }
 
 if (use_sysroot) {
-  assert(sysroot_platform == "sid" || sysroot_platform == "stretch")
   assert(current_cpu == "arm" || current_cpu == "arm64")
 
   # By default build against a sysroot image downloaded from Cloud Storage
   # during gclient runhooks.
-  sysroot =
-      "${target_sysroot_dir}/debian_${sysroot_platform}_${current_cpu}-sysroot"
+  sysroot = "${target_sysroot_dir}/debian_sid_${current_cpu}-sysroot"
   _script_arch = current_cpu
 
   if (exec_script("//build/scripts/dir_exists.py",
                   [ rebase_path(sysroot) ],
                   "string") != "True") {
-    print(
-        "Missing sysroot for $current_cpu on platform $sysroot_platform, downloading...")
-    exec_script("//build/scripts/install-sysroot.py",
-                [
-                  "$current_cpu",
-                  "$sysroot_platform",
-                ])
+    print("Missing or outdated sysroot for $current_cpu, downloading latest...")
+    exec_script("//build/scripts/install-sysroot.py", [ "$current_cpu" ])
   }
 }
diff --git a/build/scripts/install-sysroot.py b/build/scripts/install-sysroot.py
index 53b28783..e4a2e92b 100755
--- a/build/scripts/install-sysroot.py
+++ b/build/scripts/install-sysroot.py
@@ -44,7 +44,6 @@ URL_PREFIX = 'https://storage.googleapis.com'
 URL_PATH = 'openscreen-sysroots'
 
 VALID_ARCHS = ('arm', 'arm64')
-VALID_PLATFORMS = ('stretch', 'sid')
 
 
 class Error(Exception):
@@ -136,10 +135,6 @@ def parse_args(args):
         'arch',
         help='Sysroot architecture: %s' % ', '.join(VALID_ARCHS))
     p.add_argument(
-        'platform',
-        help='Sysroot platform: %s' % ', '.join(VALID_PLATFORMS)
-    )
-    p.add_argument(
         '--print-hash', action="store_true",
         help='Print the hash of the sysroot for the specified arch.')
 
@@ -151,11 +146,13 @@ def main(args):
         print('Unsupported platform. Only Linux and Mac OS X are supported.')
         return 1
 
+    # Currently, we only support linking against the sid sysroot image.
+    PLATFORM = 'sid'
     parsed_args = parse_args(args)
     if parsed_args.print_hash:
-        print(GetSysrootDict(parsed_args.platform, parsed_args.arch)['Sha1Sum'])
+        print(GetSysrootDict(PLATFORM, parsed_args.arch)['Sha1Sum'])
 
-    InstallSysroot(parsed_args.platform, parsed_args.arch)
+    InstallSysroot(PLATFORM, parsed_args.arch)
     return 0
 
 
diff --git a/build/scripts/sysroots.json b/build/scripts/sysroots.json
index 193e9412..2772287d 100644
--- a/build/scripts/sysroots.json
+++ b/build/scripts/sysroots.json
@@ -1,14 +1,4 @@
 {
-    "stretch_arm": {
-        "Sha1Sum": "407ba17bd8a686d1c82dadb593579325e4b9cd61",
-        "SysrootDir": "debian_stretch_arm-sysroot",
-        "Tarball": "debian_stretch_arm_sysroot.tar.xz"
-    },
-    "stretch_arm64": {
-        "Sha1Sum": "5523478d833a735643c0a36feed5d89a1f70846b",
-        "SysrootDir": "debian_stretch_arm64-sysroot",
-        "Tarball": "debian_stretch_arm64_sysroot.tar.xz"
-    },
     "sid_arm": {
         "Sha1Sum": "07ef353ec66ca510a9b24a927db823e44435c764",
         "SysrootDir": "debian_sid_arm-sysroot",