Roll chromium_revision 22b81f6c45..d604de96c9 (459032:459307)

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 71fd7bf86a62e18a6d4cd8fb5f682c0c3b245ec3..5e9f388d858b6d86ec0a6cc9b47cde18056d2576 100755
--- a/tools-webrtc/mb/mb.py
+++ b/tools-webrtc/mb/mb.py
@@ -1055,23 +1055,11 @@ class MetaBuildWrapper(object):
     extra_files = []
 
     if android:
-      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',
-      ]
+      cmdline = ['../../build/android/test_wrapper/logdog_wrapper.py',
+                 '--target', target,
+                 '--logdog-bin-cmd', '../../bin/logdog_butler']
       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'])
+        cmdline += ['--target-devices-file', '${SWARMING_BOT_FILE}']
     else:
       extra_files = ['../../testing/test_env.py']