From 9cc5bc8499a9aecc4559ad357fb38fc277f22ce4 Mon Sep 17 00:00:00 2001
From: Jeremy Leconte <jleconte@webrtc.org>
Date: Mon, 3 Feb 2025 14:51:07 +0100
Subject: [PATCH] Remove rust dependency on android.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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}
---
 DEPS                              |  2 +-
 tools_webrtc/android/build_aar.py |  2 --
 tools_webrtc/mb/mb_config.pyl     | 15 ---------------
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/DEPS b/DEPS
index 9db3ee0b1c..576160fa57 100644
--- a/DEPS
+++ b/DEPS
@@ -1973,7 +1973,7 @@ hooks = [
   {
     'name': 'rust',
     'pattern': '.',
-    'condition': 'checkout_android or checkout_fuzzer',
+    'condition': 'checkout_fuzzer',
     'action': ['python3', 'src/tools/rust/update_rust.py'],
   },
   {
diff --git a/tools_webrtc/android/build_aar.py b/tools_webrtc/android/build_aar.py
index f1ca2e48eb..85c1411fde 100755
--- a/tools_webrtc/android/build_aar.py
+++ b/tools_webrtc/android/build_aar.py
@@ -176,8 +176,6 @@ def Build(build_dir, arch, use_remoteexec, extra_gn_args, extra_gn_switches,
         'rtc_include_tests': False,
         'target_cpu': _GetTargetCpu(arch),
         'use_remoteexec': use_remoteexec,
-        'enable_rust': True,
-        'enable_rust_cxx': True,
     }
     arm_version = _GetArmVersion(arch)
     if arm_version:
diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl
index 79d372ff9f..8384d9aa32 100644
--- a/tools_webrtc/mb/mb_config.pyl
+++ b/tools_webrtc/mb/mb_config.pyl
@@ -237,75 +237,64 @@
     'android_asan_shared_release_bot_arm': [
       'android',
       'asan',
-      'chromium_base_dependency',
       'clang',
       'pure_release_bot',
       'arm',
     ],
     'android_debug_static_bot_arm': [
       'android',
-      'chromium_base_dependency',
       'debug_static_bot',
       'arm',
       'h265',
     ],
     'android_debug_static_bot_arm64': [
       'android',
-      'chromium_base_dependency',
       'debug_static_bot',
       'arm64',
       'h265',
     ],
     'android_debug_static_bot_x64': [
       'android',
-      'chromium_base_dependency',
       'debug_static_bot',
       'x64',
       'h265',
     ],
     'android_debug_static_bot_x86': [
       'android',
-      'chromium_base_dependency',
       'debug_static_bot',
       'x86',
       'h265',
     ],
     'android_pure_release_bot_arm': [
       'android',
-      'chromium_base_dependency',
       'pure_release_bot',
       'arm',
     ],
     'android_pure_release_bot_arm64': [
       'android',
-      'chromium_base_dependency',
       'pure_release_bot',
       'arm64',
     ],
     'android_release_bot_arm': [
       'android',
-      'chromium_base_dependency',
       'release_bot',
       'arm',
       'h265',
     ],
     'android_release_bot_arm64': [
       'android',
-      'chromium_base_dependency',
       'release_bot',
       'arm64',
       'h265',
     ],
     'android_release_bot_x64': [
       'android',
-      'chromium_base_dependency',
       'release_bot',
       'x64',
       'h265',
     ],
     'android_release_bot_x86': [
       'android',
-      'chromium_base_dependency',
       'release_bot',
       'x86',
       'h265',
@@ -332,7 +321,6 @@
     'disable_trace_events_android_arm': [
       'android',
       'arm',
-      'chromium_base_dependency',
       'disable_trace_events',
       'release_bot',
     ],
@@ -341,7 +329,6 @@
     'dummy_audio_file_devices_no_protobuf_android_arm': [
       'android',
       'arm',
-      'chromium_base_dependency',
       'debug_static_bot',
       'dummy_audio_file_devices',
       'no_protobuf',
@@ -424,7 +411,6 @@
     'perfetto_android_arm': [
       'android',
       'arm',
-      'chromium_base_dependency',
       'perfetto',
       'release_bot',
     ],
@@ -441,7 +427,6 @@
     'rtti_no_sctp_android_arm': [
       'android',
       'arm',
-      'chromium_base_dependency',
       'debug_static_bot',
       'no_sctp',
       'rtti',