Fix up some internal dependences.

Takes the easy bits of #6129

Cargo.lock

@@ -250,7 +250,6 @@ dependencies = [
  "lazy_static",
  "libsqlite3-sys",
  "log",
- "nss_build_common",
  "rusqlite",
  "serde",
  "serde_derive",
@@ -1317,7 +1316,6 @@ dependencies = [
  "cli-support",
  "ctrlc",
  "error-support",
- "find-places-db",
  "fxa-client",
  "interrupt-support",
  "log",
@@ -4145,7 +4143,6 @@ name = "sql-support"
 version = "0.1.0"
 dependencies = [
  "env_logger",
- "ffi-support",
  "interrupt-support",
  "lazy_static",
  "log",
@@ -4299,7 +4296,6 @@ dependencies = [
  "base64",
  "env_logger",
  "error-support",
- "ffi-support",
  "interrupt-support",
  "lazy_static",
  "log",
@@ -5021,7 +5017,6 @@ dependencies = [
 name = "viaduct-reqwest"
 version = "0.2.0"
 dependencies = [
- "ffi-support",
  "log",
  "once_cell",
  "reqwest",
@@ -5237,9 +5232,7 @@ dependencies = [
  "ffi-support",
  "interrupt-support",
  "lazy_static",
- "libsqlite3-sys",
  "log",
- "nss_build_common",
  "parking_lot",
  "rusqlite",
  "serde",

components/autofill/Cargo.toml

@@ -32,5 +32,4 @@ env_logger = { version = "0.10", default-features = false }
 libsqlite3-sys = { workspace = true }
 
 [build-dependencies]
-nss_build_common = { path = "../support/rc_crypto/nss/nss_build_common" }
 uniffi = { workspace = true, features = ["build"] }

components/support/sql/Cargo.toml

@@ -14,7 +14,6 @@ debug-tools = ["dep:prettytable-rs", "rusqlite/column_decltype"]
 log = "0.4"
 lazy_static = "1.4"
 interrupt-support = { path = "../interrupt" }
-ffi-support = "0.4"
 thiserror = "1.0"
 tempfile = "3.1.0"
 parking_lot = ">=0.11,<=0.12"

components/support/viaduct-reqwest/Cargo.toml

@@ -11,7 +11,6 @@ crate-type = ["lib"]
 [dependencies]
 viaduct = { path = "../../viaduct" }
 reqwest = { version = "0.11", features = ["blocking", "native-tls-vendored"] }
-ffi-support = "0.4"
 log = "0.4"
 once_cell = "1.5"
 

components/support/viaduct-reqwest/src/lib.rs

@@ -114,12 +114,3 @@ pub fn use_reqwest_backend() {
 pub extern "C" fn viaduct_use_reqwest_backend() {
     use_reqwest_backend();
 }
-
-/// A dummy symbol we include so that we can detect whether or not the reqwest
-/// backend got compiled in.
-#[no_mangle]
-pub extern "C" fn viaduct_detect_reqwest_backend() {
-    ffi_support::abort_on_panic::call_with_output(|| {
-        println!("Nothing to see here (reqwest backend available).");
-    });
-}

components/sync15/Cargo.toml

@@ -49,7 +49,6 @@ anyhow = "1.0"
 base16 = { version = "0.2", optional = true }
 base64 = { version = "0.21", optional = true }
 error-support = { path = "../support/error" }
-ffi-support = "0.4"
 interrupt-support = { path = "../support/interrupt" }
 payload-support = { path = "../support/payload" }
 lazy_static = "1.4"

components/sync15/src/telemetry.rs

@@ -782,8 +782,6 @@ impl SyncTelemetryPing {
     }
 }
 
-ffi_support::implement_into_ffi_by_json!(SyncTelemetryPing);
-
 #[cfg(test)]
 mod ping_tests {
     use super::*;

components/webext-storage/Cargo.toml

@@ -31,15 +31,10 @@ url = { version = "2.1", features = ["serde"] }
 [dev-dependencies]
 env_logger = { version = "0.10", default-features = false }
 tempfile = "3"
-# A *direct* dep on the -sys crate is required for our build.rs
-# to see the DEP_SQLITE3_LINK_TARGET env var that cargo sets
-# on its behalf.
-libsqlite3-sys = { workspace = true }
 sql-support = { path = "../support/sql" }
 # We add the perserve_order feature to guarantee ordering of the keys in our
 # JSON objects as they get serialized/deserialized.
 serde_json = { version = "1", features = ["preserve_order"] }
 
 [build-dependencies]
-nss_build_common = { path = "../support/rc_crypto/nss/nss_build_common" }
 uniffi = { workspace = true, features = ["build"] }

components/webext-storage/build.rs

@@ -2,14 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-//! Work around the fact that `sqlcipher` might get enabled by a cargo feature
-//! another crate in the workspace needs, without setting up nss.  (This is a
-//! gross hack).
 fn main() {
     println!("cargo:rerun-if-changed=build.rs");
-
-    // If NSS_DIR isn't set, we don't really care, ignore the Err case.
-    let _ = nss_build_common::link_nss();
-
     uniffi::generate_scaffolding("./src/webext-storage.udl").unwrap();
 }

examples/places-utils/Cargo.toml

@@ -28,6 +28,5 @@ cli-support = { path = "../cli-support" }
 structopt = "0.3"
 fxa-client = { path = "../../components/fxa-client" }
 tempfile = "3"
-find-places-db = { path = "../../components/support/find-places-db" }
 anyhow = "1.0"
 ctrlc = "3.2.1"