Remove descriptions for Android Debug GPU bots.

content/test/gpu/generate_buildbot_json.py

 #!/usr/bin/env python
 # Copyright 2016 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 generate chromium.gpu.json and chromium.gpu.fyi.json in
 the src/testing/buildbot directory. Maintaining these files by hand is
 too unwieldy.
 """
 
@@ skipping 379 matching lines @@
       'swarming_dimensions': {
         'gpu': '8086:0412',
         'os': 'Linux'
       },
       'build_config': 'Debug',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'linux',
     },
-    # TODO(kbr): remove the Debug Android bots once the waterfalls are
-    # restarted. crbug.com/617848
-    'Android Debug (Nexus 5)': {
-      'swarming_dimensions': {
-        # There are no PCI IDs on Android.
-        # This is a hack to get the script working.
-        'gpu': '0000:0000',
-        'os': 'Android'
-      },
-      'build_config': 'android-chromium',
-      # This bot is a one-off and doesn't have similar slaves in the
-      # swarming pool.
-      'swarming': False,
-      'os_type': 'android',
-    },
-    'Android Debug (Nexus 5X)': {
-      'swarming_dimensions': {
-        # There are no PCI IDs on Android.
-        # This is a hack to get the script working.
-        'gpu': '0000:0000',
-        'os': 'Android'
-      },
-      'build_config': 'android-chromium',
-      # This bot is a one-off and doesn't have similar slaves in the
-      # swarming pool.
-      'swarming': False,
-      'os_type': 'android',
-    },
-    'Android Swarmed Debug (Nexus 5X)': {
-      'swarming_dimensions': {
-        'device_type': 'bullhead',
-        'device_os': 'M',
-        'os': 'Android'
-      },
-      'build_config': 'android-chromium',
-      'swarming': True,
-      'os_type': 'android',
-    },
-    'Android Debug (Nexus 6)': {
-      'swarming_dimensions': {
-        # There are no PCI IDs on Android.
-        # This is a hack to get the script working.
-        'gpu': '0000:0000',
-        'os': 'Android'
-      },
-      'build_config': 'android-chromium',
-      # This bot is a one-off and doesn't have similar slaves in the
-      # swarming pool.
-      'swarming': False,
-      'os_type': 'android',
-    },
-    'Android Debug (Nexus 6P)': {
-      'swarming_dimensions': {
-        # There are no PCI IDs on Android.
-        # This is a hack to get the script working.
-        'gpu': '0000:0000',
-        'os': 'Android'
-      },
-      'build_config': 'android-chromium',
-      # This bot is a one-off and doesn't have similar slaves in the
-      # swarming pool.
-      'swarming': False,
-      'os_type': 'android',
-    },
-    'Android Debug (Nexus 9)': {
-      'swarming_dimensions': {
-        # There are no PCI IDs on Android.
-        # This is a hack to get the script working.
-        'gpu': '0000:0000',
-        'os': 'Android'
-      },
-      'build_config': 'android-chromium',
-      # This bot is a one-off and doesn't have similar slaves in the
-      # swarming pool.
-      'swarming': False,
-      'os_type': 'android',
-    },
     'Android Release (Nexus 5)': {
       'swarming_dimensions': {
         # There are no PCI IDs on Android.
         # This is a hack to get the script working.
         'gpu': '0000:0000',
         'os': 'Android'
       },
       'build_config': 'android-chromium',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
@@ skipping 747 matching lines @@
     json.dump(tests, fp, indent=2, separators=(',', ': '), sort_keys=True)
     fp.write('\n')
 
 def main():
   generate_all_tests(FYI_WATERFALL, True)
   generate_all_tests(WATERFALL, False)
   return 0
 
 if __name__ == "__main__":
   sys.exit(main())