Claudio DeSouza
8599a507b6
This value was being patched by us to use our own tree, however that's not necessary anymore. Chromium changes: https://chromium.googlesource.com/chromium/src/+/b2db8fa9667498feafdb6795f51ed9602454e4f0 commit b2db8fa9667498feafdb6795f51ed9602454e4f0 Author: Lukasz Anforowicz <lukasza@chromium.org> Date: Mon Oct 13 16:36:54 2025 -0700 [rust] Remove most remaining `cargo-vet`-related code pieces. This CL keeps `chromium_crates_io/supply-chain/audits.toml` (to avoid the risk of breaking https://github.com/google/rust-crate-audits), but removes other `cargo-vet`-related functionality from Chromium: * `supply-chain/config.toml` * `gnrt` functionality related to generating `config.toml` * `tools/rust` scripts for building the `third_party/rust-toolchain/bin/cargo-vet` binary. Manually tested by: * `cargo test` under `tools/crates/gnrt` * `tools/crates/run_gnrt.py gen` and verifying that no changes are generated Bug: 405980483 Change-Id: Idba9c73ba951a2ae9b5b46fdd59c6facbdf7ff03 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7037020 Commit-Queue: Łukasz Anforowicz <lukasza@chromium.org> Reviewed-by: Daniel Cheng <dcheng@chromium.org> Cr-Commit-Position: refs/heads/main@{#1529201}
25 lines
1.3 KiB
Diff
25 lines
1.3 KiB
Diff
diff --git a/tools/crates/gnrt/lib/paths.rs b/tools/crates/gnrt/lib/paths.rs
|
|
index f5605e751b0ba611eb088fd930ccda7dfebdb24f..9cce0fa999d87ebddd6a4d1b29b59b58c96aabfd 100644
|
|
--- a/tools/crates/gnrt/lib/paths.rs
|
|
+++ b/tools/crates/gnrt/lib/paths.rs
|
|
@@ -136,7 +136,7 @@ pub fn get_build_dir_for_package(
|
|
.join(Epoch::from_version(version).to_string())
|
|
}
|
|
|
|
-static RUST_THIRD_PARTY_DIR: &str = "third_party/rust";
|
|
+static RUST_THIRD_PARTY_DIR: &str = "brave/third_party/rust";
|
|
static RUST_SRC_LIBRARY_SUBDIR: &str = "library";
|
|
static RUST_SRC_VENDOR_SUBDIR: &str = "library/vendor";
|
|
static RUST_SRC_INSTALLED_DIR: &str = "third_party/rust-toolchain/lib/rustlib/src/rust";
|
|
@@ -147,8 +147,8 @@ static STD_FAKE_ROOT: &str = "build/rust/std/fake_root";
|
|
static STD_FAKE_ROOT_CONFIG_TEMPLATE: &str = "build/rust/std/fake_root/.cargo/config.toml.template";
|
|
static STD_FAKE_ROOT_CARGO_TEMPLATE: &str = "build/rust/std/fake_root/Cargo.toml.template";
|
|
|
|
-static THIRD_PARTY_CARGO_ROOT: &str = "third_party/rust/chromium_crates_io";
|
|
-static THIRD_PARTY_CONFIG_FILE: &str = "third_party/rust/chromium_crates_io/gnrt_config.toml";
|
|
+static THIRD_PARTY_CARGO_ROOT: &str = "brave/third_party/rust/chromium_crates_io";
|
|
+static THIRD_PARTY_CONFIG_FILE: &str = "brave/third_party/rust/chromium_crates_io/gnrt_config.toml";
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|