Roll chromium_revision 0036d9b08e..2d05f4450c (457220:457366)

tools-webrtc/mb/mb.py

Index: tools-webrtc/mb/mb.py
diff --git a/tools-webrtc/mb/mb.py b/tools-webrtc/mb/mb.py
index 9eb818ae23e73855d6221c38d7f60d72e26255b4..1801a13ac49804a605e7605f76cfbb69b5c619d4 100755
--- a/tools-webrtc/mb/mb.py
+++ b/tools-webrtc/mb/mb.py
@@ -1055,9 +1055,23 @@ class MetaBuildWrapper(object):
     extra_files = []
 
     if android:
-      cmdline = ['./../../build/android/test_wrapper/logdog_wrapper.py',
-                 '--target', target,
-                 '--logdog-bin-cmd', '../../bin/logdog_butler']
+      logdog_command = [
+          '--logdog-bin-cmd', './../../bin/logdog_butler',
+          '--project', 'chromium',
+          '--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),
+          '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',
+      ]
+      if test_type != 'junit_test':
+        test_cmdline += ['--target-devices-file', '${SWARMING_BOT_FILE}',]
+      cmdline = (['./../../build/android/test_wrapper/logdog_wrapper.py']
+                 + logdog_command + test_cmdline + ['-v'])
     else:
       extra_files = ['../../testing/test_env.py']