fix_android.diff

diff --git a/toolkit/library/rust/Cargo.toml b/toolkit/library/rust/Cargo.toml
index 786645106085..69969f87a191 100644
--- a/toolkit/library/rust/Cargo.toml
+++ b/toolkit/library/rust/Cargo.toml
@@ -30,6 +30,7 @@ fuzzing_interfaces = ["gkrust-shared/fuzzing_interfaces"]
 webrtc = ["gkrust-shared/webrtc"]
 wasm_library_sandboxing = ["gkrust-shared/wasm_library_sandboxing"]
 webgpu = ["gkrust-shared/webgpu"]
+remote_agent = ["gkrust-shared/remote"]
 
 [dependencies]
 gkrust-shared = { path = "shared" }
diff --git a/toolkit/library/rust/gkrust-features.mozbuild b/toolkit/library/rust/gkrust-features.mozbuild
index a08bb8a094b9..a23bc338f05a 100644
--- a/toolkit/library/rust/gkrust-features.mozbuild
+++ b/toolkit/library/rust/gkrust-features.mozbuild
@@ -67,3 +67,6 @@ if CONFIG['FUZZING_INTERFACES']:
 
 if CONFIG['MOZ_WEBRTC']:
     gkrust_features += ['webrtc']
+
+if CONFIG['ENABLE_REMOTE_AGENT']:
+    gkrust_features += ['remote_agent']
diff --git a/toolkit/library/rust/shared/Cargo.toml b/toolkit/library/rust/shared/Cargo.toml
index a5d6b65f5e68..4d5eecc10879 100644
--- a/toolkit/library/rust/shared/Cargo.toml
+++ b/toolkit/library/rust/shared/Cargo.toml
@@ -45,7 +45,7 @@ neqo_glue = { path = "../../../../netwerk/socket/neqo_glue" }
 rlbox_lucet_sandbox = { version = "0.1.0", optional = true }
 wgpu-remote = { path = "../../../../gfx/wgpu/wgpu-remote", optional = true }
 mapped_hyph = { git = "https://github.com/jfkthame/mapped_hyph.git", tag = "v0.3.0" }
-remote = { path = "../../../../remote" }
+remote = { path = "../../../../remote", optional = true }
 
 [build-dependencies]
 rustc_version = "0.2"
@@ -75,6 +75,7 @@ fuzzing_interfaces = []
 webrtc = ["mdns_service"]
 wasm_library_sandboxing = ["rlbox_lucet_sandbox"]
 webgpu = ["wgpu-remote"]
+remote_agent = ["remote"]
 
 [lib]
 path = "lib.rs"
diff --git a/toolkit/library/rust/shared/lib.rs b/toolkit/library/rust/shared/lib.rs
index 9941016a738c..a0250cc83b69 100644
--- a/toolkit/library/rust/shared/lib.rs
+++ b/toolkit/library/rust/shared/lib.rs
@@ -58,6 +58,7 @@ extern crate wgpu_remote;
 #[cfg(feature = "wasm_library_sandboxing")]
 extern crate rlbox_lucet_sandbox;
 
+#[cfg(feature = "remote")]
 extern crate remote;
 
 use std::boxed::Box;