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

Remove rust dependency on android.

Browse Source 
This was needed because Android builds depended on chromium base which is not the case anymore.

Bug: None
Change-Id: I0de26ff61fe105c68a6d60def291c542f4b65a70
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/376240
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43843}
This commit is contained in:
Jeremy Leconte 2025-02-03 14:51:07 +01:00 committed by WebRTC LUCI CQ
parent a6f35491d6
commit 9cc5bc8499
3 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -1973,7 +1973,7 @@ hooks = [
{ {
'name': 'rust', 'name': 'rust',
'pattern': '.', 'pattern': '.',
'condition': 'checkout_android or checkout_fuzzer', 'condition': 'checkout_fuzzer',
'action': ['python3', 'src/tools/rust/update_rust.py'], 'action': ['python3', 'src/tools/rust/update_rust.py'],
}, },
{ {

2
tools_webrtc/android/build_aar.py
View File

@ -176,8 +176,6 @@ def Build(build_dir, arch, use_remoteexec, extra_gn_args, extra_gn_switches,
'rtc_include_tests': False, 'rtc_include_tests': False,
'target_cpu': _GetTargetCpu(arch), 'target_cpu': _GetTargetCpu(arch),
'use_remoteexec': use_remoteexec, 'use_remoteexec': use_remoteexec,
'enable_rust': True,
'enable_rust_cxx': True,
} }
arm_version = _GetArmVersion(arch) arm_version = _GetArmVersion(arch)
if arm_version: if arm_version:

15
tools_webrtc/mb/mb_config.pyl
View File

@ -237,75 +237,64 @@
'android_asan_shared_release_bot_arm': [ 'android_asan_shared_release_bot_arm': [
'android', 'android',
'asan', 'asan',
'chromium_base_dependency',
'clang', 'clang',
'pure_release_bot', 'pure_release_bot',
'arm', 'arm',
], ],
'android_debug_static_bot_arm': [ 'android_debug_static_bot_arm': [
'android', 'android',
'chromium_base_dependency',
'debug_static_bot', 'debug_static_bot',
'arm', 'arm',
'h265', 'h265',
], ],
'android_debug_static_bot_arm64': [ 'android_debug_static_bot_arm64': [
'android', 'android',
'chromium_base_dependency',
'debug_static_bot', 'debug_static_bot',
'arm64', 'arm64',
'h265', 'h265',
], ],
'android_debug_static_bot_x64': [ 'android_debug_static_bot_x64': [
'android', 'android',
'chromium_base_dependency',
'debug_static_bot', 'debug_static_bot',
'x64', 'x64',
'h265', 'h265',
], ],
'android_debug_static_bot_x86': [ 'android_debug_static_bot_x86': [
'android', 'android',
'chromium_base_dependency',
'debug_static_bot', 'debug_static_bot',
'x86', 'x86',
'h265', 'h265',
], ],
'android_pure_release_bot_arm': [ 'android_pure_release_bot_arm': [
'android', 'android',
'chromium_base_dependency',
'pure_release_bot', 'pure_release_bot',
'arm', 'arm',
], ],
'android_pure_release_bot_arm64': [ 'android_pure_release_bot_arm64': [
'android', 'android',
'chromium_base_dependency',
'pure_release_bot', 'pure_release_bot',
'arm64', 'arm64',
], ],
'android_release_bot_arm': [ 'android_release_bot_arm': [
'android', 'android',
'chromium_base_dependency',
'release_bot', 'release_bot',
'arm', 'arm',
'h265', 'h265',
], ],
'android_release_bot_arm64': [ 'android_release_bot_arm64': [
'android', 'android',
'chromium_base_dependency',
'release_bot', 'release_bot',
'arm64', 'arm64',
'h265', 'h265',
], ],
'android_release_bot_x64': [ 'android_release_bot_x64': [
'android', 'android',
'chromium_base_dependency',
'release_bot', 'release_bot',
'x64', 'x64',
'h265', 'h265',
], ],
'android_release_bot_x86': [ 'android_release_bot_x86': [
'android', 'android',
'chromium_base_dependency',
'release_bot', 'release_bot',
'x86', 'x86',
'h265', 'h265',
@ -332,7 +321,6 @@
'disable_trace_events_android_arm': [ 'disable_trace_events_android_arm': [
'android', 'android',
'arm', 'arm',
'chromium_base_dependency',
'disable_trace_events', 'disable_trace_events',
'release_bot', 'release_bot',
], ],
@ -341,7 +329,6 @@
'dummy_audio_file_devices_no_protobuf_android_arm': [ 'dummy_audio_file_devices_no_protobuf_android_arm': [
'android', 'android',
'arm', 'arm',
'chromium_base_dependency',
'debug_static_bot', 'debug_static_bot',
'dummy_audio_file_devices', 'dummy_audio_file_devices',
'no_protobuf', 'no_protobuf',
@ -424,7 +411,6 @@
'perfetto_android_arm': [ 'perfetto_android_arm': [
'android', 'android',
'arm', 'arm',
'chromium_base_dependency',
'perfetto', 'perfetto',
'release_bot', 'release_bot',
], ],
@ -441,7 +427,6 @@
'rtti_no_sctp_android_arm': [ 'rtti_no_sctp_android_arm': [
'android', 'android',
'arm', 'arm',
'chromium_base_dependency',
'debug_static_bot', 'debug_static_bot',
'no_sctp', 'no_sctp',
'rtti', 'rtti',