[NaCl SDK] Remove support for bionic toolchain

Second attempt at landing.  First attempt was
reverted: https://codereview.chromium.org/1269623004

CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:linux_nacl_sdk;tryserver.chromium.mac:mac_nacl_sdk;tryserver.chromium.win:win_nacl_sdk;tryserver.chromium.linux:linux_chromium_rel_ng

Review URL: https://codereview.chromium.org/1489103002

Cr-Commit-Position: refs/heads/master@{#362611}

1 files changed, 4 insertions, 22 deletions

diff --git a/native_client_sdk/src/build_tools/update_nacl_manifest.py b/native_client_sdk/src/build_tools/update_nacl_manifest.py
index a2d8776..82934b7 100755
--- a/native_client_sdk/src/build_tools/update_nacl_manifest.py
+++ b/native_client_sdk/src/build_tools/update_nacl_manifest.py
@@ -38,7 +38,6 @@ GS_SDK_MANIFEST_LOG = GS_BUCKET_PATH + MANIFEST_BASENAME + '.log'
 GS_MANIFEST_BACKUP_DIR = GS_BUCKET_PATH + 'manifest_backups/'
 
 CANARY_BUNDLE_NAME = 'pepper_canary'
-BIONIC_CANARY_BUNDLE_NAME = 'bionic_canary'
 CANARY = 'canary'
 NACLPORTS_ARCHIVE_NAME = 'naclports.tar.bz2'
 
@@ -125,11 +124,6 @@ def GetPlatformArchiveName(platform):
   return 'naclsdk_%s.tar.bz2' % platform
 
 
-def GetBionicArchiveName():
-  """Get the basename of an archive. Currently this is linux-only"""
-  return 'naclsdk_bionic.tar.bz2'
-
-
 def GetCanonicalArchiveName(url):
   """Get the canonical name of an archive given its URL.
 
@@ -361,14 +355,12 @@ class VersionFinder(object):
         e.g. [('foo.tar.bz2', '18.0.1000.0'), ('bar.tar.bz2', '19.0.1100.20')]
         These archives must exist to consider a version for inclusion, as
         long as that version is greater than the archive's minimum version.
-    is_bionic: True if we are searching for bionic archives.
   """
-  def __init__(self, delegate, platforms, extra_archives=None, is_bionic=False):
+  def __init__(self, delegate, platforms, extra_archives=None):
     self.delegate = delegate
     self.history = delegate.GetHistory()
     self.platforms = platforms
     self.extra_archives = extra_archives
-    self.is_bionic = is_bionic
 
   def GetMostRecentSharedVersion(self, major_version):
     """Returns the most recent version of a pepper bundle that exists on all
@@ -421,11 +413,7 @@ class VersionFinder(object):
     """
     archive_urls = self._GetAvailableArchivesFor(version)
 
-    if self.is_bionic:
-      # Bionic currently is Linux-only.
-      expected_archives = set([GetBionicArchiveName()])
-    else:
-      expected_archives = set(GetPlatformArchiveName(p) for p in self.platforms)
+    expected_archives = set(GetPlatformArchiveName(p) for p in self.platforms)
 
     if self.extra_archives:
       for extra_archive, min_version, max_version in self.extra_archives:
@@ -808,7 +796,7 @@ def Run(delegate, platforms, extra_archives, fixed_bundle_versions=None):
   manifest = delegate.GetRepoManifest()
   auto_update_bundles = []
   for bundle in manifest.GetBundles():
-    if not bundle.name.startswith(('pepper_', 'bionic_')):
+    if not bundle.name.startswith('pepper_'):
       continue
     archives = bundle.GetArchives()
     if not archives:
@@ -822,13 +810,7 @@ def Run(delegate, platforms, extra_archives, fixed_bundle_versions=None):
 
   for bundle in auto_update_bundles:
     try:
-      if bundle.name == BIONIC_CANARY_BUNDLE_NAME:
-        logger.info('>>> Looking for most recent bionic_canary...')
-        # Ignore extra_archives on bionic; There is no naclports bundle yet.
-        version_finder = VersionFinder(delegate, platforms, None,
-                                       is_bionic=True)
-        version, channel, archives = version_finder.GetMostRecentSharedCanary()
-      elif bundle.name == CANARY_BUNDLE_NAME:
+      if bundle.name == CANARY_BUNDLE_NAME:
         logger.info('>>> Looking for most recent pepper_canary...')
         version_finder = VersionFinder(delegate, platforms, extra_archives)
         version, channel, archives = version_finder.GetMostRecentSharedCanary()