| 1 | Patch-Source: https://salsa.debian.org/chromium-team/chromium/-/blob/96bdb2b923774cf54f3c7598d941df3f769b7897/debian/patches/system/rust-cbor.patch
|
| 2 |
|
| 3 | ERROR at //build/rust/crubit/BUILD.gn:11:5: Unable to load "/chr-build/chromium-152.0.7977.64/third_party/rust-toolchain/lib/third_party/crubit/support/BUILD.gn".
|
| 4 | "$crubit_src_dir/support:support_cpp",
|
| 5 | ^------------------------------------
|
| 6 |
|
| 7 | Patch taken from https://github.com/ungoogled-software/ungoogled-chromium/pull/3928/changes
|
| 8 | (though clearly a more permanent solution is needed, if upstream is
|
| 9 | planning to drop USE_CBOR_RUST..)
|
| 10 |
|
| 11 | |
| 12 | |
| 13 | @@ -12,7 +12,7 @@ buildflag_header("buildflags") {
|
| 14 | # TODO(crbug.com/535682335): Remove `USE_CBOR_RUST` buildflag entirely,
|
| 15 | # unconditionally enable Rust CBOR parser, and drop `is_cronet_build` check
|
| 16 | # once Cronet supports Crubit dependencies.
|
| 17 | - flags = [ "USE_CBOR_RUST=!$is_cronet_build" ]
|
| 18 | + flags = [ "USE_CBOR_RUST=$enable_cpp_api_from_rust" ]
|
| 19 | }
|
| 20 |
|
| 21 | component("cbor") {
|
| 22 | @@ -37,7 +37,7 @@ component("cbor") {
|
| 23 | "//base",
|
| 24 | ]
|
| 25 |
|
| 26 | - if (!is_cronet_build) {
|
| 27 | + if (enable_cpp_api_from_rust) {
|
| 28 | public_deps = [
|
| 29 | "//build/rust/crubit",
|
| 30 | "//components/cbor/rust:cbor_rust_bindings",
|
| 31 | @@ -63,7 +63,7 @@ source_set("unit_tests") {
|
| 32 | "//testing/gtest",
|
| 33 | "//third_party/fuzztest",
|
| 34 | ]
|
| 35 | - if (!is_cronet_build) {
|
| 36 | + if (enable_cpp_api_from_rust) {
|
| 37 | deps += [ "//components/cbor/rust:cbor_rust_unittests" ]
|
| 38 | }
|
| 39 |
|