From 3b2402bd238289ea5539fc464435ce3c217d8f55 Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Thu, 14 Nov 2024 14:53:11 +0100 Subject: [PATCH] Fix rust DEPS. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * This is a forward fix for https://webrtc-review.googlesource.com/c/src/+/367921. * Also add 'enable_rust' gn arg when running build_aar because it is failing otherwise (https://logs.chromium.org/logs/webrtc/buildbucket/cr-buildbucket/8731293654930007281/+/u/build_android_archive/stdout). Change-Id: I676ca47255e9b33f04487624625b0078dcb137a7 Bug: None Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/368300 Commit-Queue: Jeremy Leconte Reviewed-by: Björn Terelius Cr-Commit-Position: refs/heads/main@{#43400} --- DEPS | 7 +------ tools_webrtc/android/build_aar.py | 2 ++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/DEPS b/DEPS index 650d687df4..7f3e4a7ffc 100644 --- a/DEPS +++ b/DEPS @@ -126,12 +126,7 @@ deps = { 'condition': 'not (host_os == "linux" and host_cpu == "arm64")', }, - 'third_party/rust': { - 'url': Var('chromium_git') + '/chromium/src/third_party/rust@0e0ef14876a32128574eaf80bc7fc1c7cde92006', - 'condition': 'checkout_android or checkout_fuzzer', - }, - - 'third_party/rust-toolchain': { + 'src/third_party/rust-toolchain': { 'dep_type': 'gcs', 'bucket': 'chromium-browser-clang', 'objects': [ diff --git a/tools_webrtc/android/build_aar.py b/tools_webrtc/android/build_aar.py index 85c1411fde..f1ca2e48eb 100755 --- a/tools_webrtc/android/build_aar.py +++ b/tools_webrtc/android/build_aar.py @@ -176,6 +176,8 @@ 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: