From 00a248149a67bce34fa36df1637c67681cebf20d Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Wed, 6 May 2026 13:01:16 +0000
Subject: [PATCH] Bug 2002854 - app-services stub toolchains are unstubbed.
 r=nalexander

Differential Revision: https://phabricator.services.mozilla.com/D274371
---
 Cargo.lock                                                  | 2 ++
 .../app-services-tools/embedded-uniffi-bindgen/Cargo.toml   | 1 +
 .../src/bin/embedded-uniffi-bindgen.rs                      | 2 +-
 services/app-services-tools/nimbus-fml/Cargo.toml           | 1 +
 .../app-services-tools/nimbus-fml/src/bin/nimbus-fml.rs     | 6 +++++-
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ad30e76f709d..c31dc91b5f09 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8092,6 +8092,7 @@ checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"
 name = "toolchain-embedded-uniffi-bindgen"
 version = "0.1.0"
 dependencies = [
+ "embedded-uniffi-bindgen",
  "mozilla-central-workspace-hack",
 ]
 
@@ -8100,6 +8101,7 @@ name = "toolchain-nimbus-fml"
 version = "0.1.0"
 dependencies = [
  "mozilla-central-workspace-hack",
+ "nimbus-fml",
 ]
 
 [[package]]
diff --git a/services/app-services-tools/embedded-uniffi-bindgen/Cargo.toml b/services/app-services-tools/embedded-uniffi-bindgen/Cargo.toml
index e7667a3ae246..5c086ef03fe9 100644
--- a/services/app-services-tools/embedded-uniffi-bindgen/Cargo.toml
+++ b/services/app-services-tools/embedded-uniffi-bindgen/Cargo.toml
@@ -8,4 +8,5 @@ license = "MPL-2.0"
 name = "embedded-uniffi-bindgen"
 
 [dependencies]
+embedded-uniffi-bindgen = { path = "../../../third_party/application-services/tools/embedded-uniffi-bindgen" }
 mozilla-central-workspace-hack = { version = "0.1", features = ["toolchain-embedded-uniffi-bindgen"], optional = true }
diff --git a/services/app-services-tools/embedded-uniffi-bindgen/src/bin/embedded-uniffi-bindgen.rs b/services/app-services-tools/embedded-uniffi-bindgen/src/bin/embedded-uniffi-bindgen.rs
index 21b4eeda8f2f..4ba59153e175 100644
--- a/services/app-services-tools/embedded-uniffi-bindgen/src/bin/embedded-uniffi-bindgen.rs
+++ b/services/app-services-tools/embedded-uniffi-bindgen/src/bin/embedded-uniffi-bindgen.rs
@@ -3,5 +3,5 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 fn main() {
-    unreachable!("a place-holder for the app-services monorepo migration");
+    embedded_uniffi_bindgen::main().unwrap()
 }
diff --git a/services/app-services-tools/nimbus-fml/Cargo.toml b/services/app-services-tools/nimbus-fml/Cargo.toml
index af25fa665d38..e0bf02fb5089 100644
--- a/services/app-services-tools/nimbus-fml/Cargo.toml
+++ b/services/app-services-tools/nimbus-fml/Cargo.toml
@@ -8,4 +8,5 @@ license = "MPL-2.0"
 name = "nimbus-fml"
 
 [dependencies]
+nimbus-fml = { path = "../../../third_party/application-services/components/support/nimbus-fml" }
 mozilla-central-workspace-hack = { version = "0.1", features = ["toolchain-nimbus-fml"], optional = true }
diff --git a/services/app-services-tools/nimbus-fml/src/bin/nimbus-fml.rs b/services/app-services-tools/nimbus-fml/src/bin/nimbus-fml.rs
index 21b4eeda8f2f..d390fa40015b 100644
--- a/services/app-services-tools/nimbus-fml/src/bin/nimbus-fml.rs
+++ b/services/app-services-tools/nimbus-fml/src/bin/nimbus-fml.rs
@@ -3,5 +3,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 fn main() {
-    unreachable!("a place-holder for the app-services monorepo migration");
+    nimbus_fml::command_line::do_main(
+        std::env::args_os(),
+        &std::env::current_dir().expect("no cwd"),
+    )
+    .expect("nimbus failed")
 }