gpu: Fix gtest recipes to be compatible with unified swarming logcat.

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 1072 matching lines @@
     result['name'] = test
   else:
     # Put the swarming dimensions in anyway. If the tester is later
     # swarmed, they will come in handy.
     if not 'swarming' in result:
       result['swarming'] = {}
     result['swarming'].update({
       'can_use_on_swarming_builders': True,
       'dimension_sets': [
         tester_config['swarming_dimensions']
-      ],
+      ]
     })
     if is_android(tester_config):
       # Override the isolate target to get rid of any "_apk" suffix
       # that would be added by the recipes.
       result['override_isolate_target'] = test
+      # Integrate with the unified logcat system.
+      result['swarming'].update({
+        'cipd_packages': [
+          {
+            'cipd_package': 'infra/tools/luci/logdog/butler/${platform}',
+            'location': 'bin',
+            'revision': 'git_revision:3ff24775a900b675866fbcacf2a8f98a18b2a16a'
+          }
+        ],
+        'output_links': [
+          {
+            'link': [
+              'https://luci-logdog.appspot.com/v/?s',
+              '=android%2Fswarming%2Flogcats%2F',
+              '${TASK_ID}%2F%2B%2Funified_logcats'
+            ],
+            'name': 'shard #${SHARD_INDEX} logcats'
+          }
+        ]
+      })
   if 'desktop_args' in result:
     if not is_android(tester_config):
       if not 'args' in result:
         result['args'] = []
       result['args'] += result['desktop_args']
     # Don't put the desktop args in the JSON.
     result.pop('desktop_args')
 
   # This flag only has an effect on the Linux bots that run tests
   # locally (as opposed to via Swarming), which are only those couple
@@ skipping 111 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())