admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prepare the code to inherit from chromium's mb.py (3rd attempt).

Browse Source 
Basically try to make low_bandwidth_audio_perf_test target work with chromium's mb.

Bug: webrtc:13867
Change-Id: If111e2b0f4f82935062d6321f4d16cc72c77d572
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/256975
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#36364}
This commit is contained in:
Jeremy Leconte 2022-03-29 10:48:04 +02:00 committed by WebRTC LUCI CQ
parent 8df1957885
commit bddfa1d9de
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio/BUILD.gn
View File

@ -284,12 +284,6 @@ if (rtc_include_tests) {
if (is_mac) { if (is_mac) {
data += [ "../tools_webrtc/audio_quality/mac/pesq" ] data += [ "../tools_webrtc/audio_quality/mac/pesq" ]
} }
if (is_win) {
write_runtime_deps = "${root_out_dir}/${target_name}.exe.runtime_deps"
} else {
write_runtime_deps = "${root_out_dir}/${target_name}.runtime_deps"
}
} }
} }

2
tools_webrtc/mb/gn_isolate_map.pyl
View File

@ -68,7 +68,7 @@
}, },
"low_bandwidth_audio_perf_test": { "low_bandwidth_audio_perf_test": {
"label": "//audio:low_bandwidth_audio_perf_test", "label": "//audio:low_bandwidth_audio_perf_test",
"type": "console_test_launcher", "type": "script",
"script": "//audio/test/low_bandwidth_audio_test.py", "script": "//audio/test/low_bandwidth_audio_test.py",
"args": [ "args": [
".", "--remove", ".", "--remove",

10
tools_webrtc/mb/mb.py
View File

@ -723,12 +723,13 @@ class MetaBuildWrapper:
android = 'target_os="android"' in vals['gn_args'] android = 'target_os="android"' in vals['gn_args']
for target in swarming_targets: for target in swarming_targets:
label = isolate_map[target]['label']
stamp_runtime_deps = 'obj/%s.stamp.runtime_deps' % label.replace(':', '/')
if android: if android:
# Android targets may be either android_apk or executable. The # Android targets may be either android_apk or executable. The
# former will result in runtime_deps associated with the stamp # former will result in runtime_deps associated with the stamp
# file, while the latter will result in runtime_deps associated # file, while the latter will result in runtime_deps associated
# with the executable. # with the executable.
label = isolate_map[target]['label']
runtime_deps_targets = [ runtime_deps_targets = [
target + '.runtime_deps', target + '.runtime_deps',
'obj/%s.stamp.runtime_deps' % label.replace(':', '/') 'obj/%s.stamp.runtime_deps' % label.replace(':', '/')
@ -739,12 +740,11 @@ class MetaBuildWrapper:
else: else:
runtime_deps_targets = ['browser_tests.runtime_deps'] runtime_deps_targets = ['browser_tests.runtime_deps']
elif isolate_map[target]['type'] == 'script': elif isolate_map[target]['type'] == 'script':
label = isolate_map[target]['label'].split(':')[1] runtime_deps_targets = [stamp_runtime_deps]
runtime_deps_targets = ['%s.runtime_deps' % label]
if self.platform == 'win32': if self.platform == 'win32':
runtime_deps_targets += [label + '.exe.runtime_deps'] runtime_deps_targets += [target + '.exe.runtime_deps']
else: else:
runtime_deps_targets += [label + '.runtime_deps'] runtime_deps_targets += [target + '.runtime_deps']
elif self.platform == 'win32': elif self.platform == 'win32':
runtime_deps_targets = [target + '.exe.runtime_deps'] runtime_deps_targets = [target + '.exe.runtime_deps']
else: else:

2
tools_webrtc/mb/mb_unittest.py
View File

@ -461,7 +461,7 @@ class UnitTest(unittest.TestCase):
" 'type': 'script'," " 'type': 'script',"
" 'script': '//base/base_unittests_script.py'," " 'script': '//base/base_unittests_script.py',"
"}}\n"), "}}\n"),
'/fake_src/out/Default/base_unittests.runtime_deps': '/fake_src/out/Default/base_unittests_script.runtime_deps':
("base_unittests\n" ("base_unittests\n"
"base_unittests_script.py\n"), "base_unittests_script.py\n"),
} }