Make it possible to run low_bandwidth_audio_test on Android swarming.
R=phoglund@webrtc.org, solenberg@webrtc.org
Bug: chromium:755660
Change-Id: I8755a9c9df92fe8157c870cc7519130291441b25
Reviewed-on: https://webrtc-review.googlesource.com/39780
Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Edward Lemur <ehmaldonado@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21634}
diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index f7b1cb5..d3af836 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -171,7 +171,7 @@
"../resources/voice_engine/audio_tiny48.wav",
"test/low_bandwidth_audio_test.py",
]
- if (is_linux) {
+ if (is_linux || is_android) {
data += [
"../tools_webrtc/audio_quality/linux/PolqaOem64",
"../tools_webrtc/audio_quality/linux/pesq",
diff --git a/tools_webrtc/mb/mb.py b/tools_webrtc/mb/mb.py
index ca021d3..682532e 100755
--- a/tools_webrtc/mb/mb.py
+++ b/tools_webrtc/mb/mb.py
@@ -1050,14 +1050,14 @@
cmdline = []
extra_files = []
- if android:
+ if test_type == 'script':
+ cmdline = ['../../' + self.ToSrcRelPath(isolate_map[target]['script'])]
+ elif android:
cmdline = ['../../build/android/test_wrapper/logdog_wrapper.py',
'--target', target,
'--logdog-bin-cmd', '../../bin/logdog_butler',
'--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',
'--store-tombstones']
- elif test_type == "script":
- cmdline = ['../../' + self.ToSrcRelPath(isolate_map[target]['script'])]
else:
extra_files = ['../../testing/test_env.py']