From e05d720f1c8848aef216777d3d02afba0cb2d1e2 Mon Sep 17 00:00:00 2001 From: Oleh Prypin Date: Fri, 14 Dec 2018 15:12:18 +0100 Subject: [PATCH] Switch to logdog binary provided by IMPLIED_CIPD_BINARIES https://cs.chromium.org/chromium/build/scripts/slave/recipe_modules/swarming/api.py?q=IMPLIED_CIPD_BINARIES to stop having to specify it in https://cs.chromium.org/chromium/build/scripts/slave/recipe_modules/webrtc/steps.py?q=ANDROID_CIPD_PACKAGES Bug: chromium:755660 Change-Id: I1c69b0bada145ce830c4f62d6e99cc928cd29024 Reviewed-on: https://webrtc-review.googlesource.com/c/114426 Commit-Queue: Oleh Prypin Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#26015} --- tools_webrtc/mb/mb.py | 2 +- tools_webrtc/mb/mb_unittest.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools_webrtc/mb/mb.py b/tools_webrtc/mb/mb.py index 485fceb858..eeeab847dd 100755 --- a/tools_webrtc/mb/mb.py +++ b/tools_webrtc/mb/mb.py @@ -839,7 +839,7 @@ class MetaBuildWrapper(object): elif is_android: cmdline = ['../../build/android/test_wrapper/logdog_wrapper.py', '--target', target, - '--logdog-bin-cmd', '../../bin/logdog_butler', + '--logdog-bin-cmd', '../../logdog_butler', '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats', '--store-tombstones'] else: diff --git a/tools_webrtc/mb/mb_unittest.py b/tools_webrtc/mb/mb_unittest.py index 0e7173abb4..287850bd45 100755 --- a/tools_webrtc/mb/mb_unittest.py +++ b/tools_webrtc/mb/mb_unittest.py @@ -304,7 +304,7 @@ class UnitTest(unittest.TestCase): self.assertEqual(command, [ '../../build/android/test_wrapper/logdog_wrapper.py', '--target', 'base_unittests', - '--logdog-bin-cmd', '../../bin/logdog_butler', + '--logdog-bin-cmd', '../../logdog_butler', '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats', '--store-tombstones', ]) @@ -338,7 +338,7 @@ class UnitTest(unittest.TestCase): self.assertEqual(command, [ '../../build/android/test_wrapper/logdog_wrapper.py', '--target', 'base_unittests', - '--logdog-bin-cmd', '../../bin/logdog_butler', + '--logdog-bin-cmd', '../../logdog_butler', '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats', '--store-tombstones', ])