Logdog for logcats

tools/mb/mb.py

Index: tools/mb/mb.py
diff --git a/tools/mb/mb.py b/tools/mb/mb.py
index c21e2f10879f11ee85bc4d03fac9fbd5cfc35a13..0583111720be53e8cf86d15b0e018be440042d17 100755
--- a/tools/mb/mb.py
+++ b/tools/mb/mb.py
@@ -1010,12 +1010,24 @@ class MetaBuildWrapper(object):
     extra_files = []
 
     if android and test_type != "script":
-      cmdline = [
+      logdog_command = [
+          '--logdog-bin-cmd', './../../bin/logdog_butler',
+          '--project', 'chromium',
+          '--output', 'logdog,host=luci-logdog-dev.appspot.com',
+          '--service-account-json',
+          '/creds/service_accounts/service-account-luci-logdog-publisher.json',
+          '--prefix', 'android/swarming/logcats/${SWARMING_TASK_ID}',
+          '--source', '${ISOLATED_OUTDIR}/logcats',
+          '--name', 'unified_logcats',
+      ]
+      test_cmdline = [
           self.PathJoin('bin', 'run_%s' % target_name),
-          '--logcat-output-dir', '${ISOLATED_OUTDIR}/logcats',
+          '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',
           '--target-devices-file', '${SWARMING_BOT_FILE}',
-          '-v',
+          '-v'
       ]
+      cmdline = (['./../../build/android/test_wrapper/test_runner_wrapper.py'] +
+                 logdog_command + test_cmdline)
     elif use_x11 and test_type == 'windowed_test_launcher':
       extra_files = [
           'xdisplaycheck',