megazords

Author: mhammond

Cargo.lock

@@ -278,7 +278,8 @@ def print_rust_environment():
 def calc_rust_env(package, features):
     if features == RustFeatures.ALL:
         # Anything needing special support for sqlite might fail to link it.
-        # `--all-features` in CI hits this - it shouldn't be this way!
+        # `--all-features` in CI (notably nss-sys via rc_crypto) hits this.
+        # This shouldn't be this way!
         return {
             **os.environ,
             'RUSTFLAGS' : "--cfg __appsvc_ci_sqlite_hack"

automation/tests.py

@@ -24,7 +24,11 @@ autofill = { path = "../../components/autofill" }
 crashtest = { path = "../../components/crashtest" }
 error-support = { path = "../../components/support/error" }
 suggest = { path = "../../components/suggest" }
-# Force the "bundled" feature????
-rusqlite = { version = "0.29.0" }
+
+# This is a bit of a mess. It appears we get rusqlite=bundled as a side-effect of
+# none of the rc_crypto consumers *not* using the `gecko` feature in that crate.
+# If we wanted to *avoid* the bundled sqlite here we'd need to use the `in_gecko` feature of rusqlite.
+# In an ideal world, it seems we should be required to use `features=["bundled]` for rusqlite here.
+# (But for now we want to ship our sqlite for Android, so don't need to do anything here currently)
 
 lazy_static = "1.4"

megazords/full/Cargo.toml

@@ -28,5 +28,5 @@ error-support = { path = "../../components/support/error" }
 sync_manager = { path = "../../components/sync_manager" }
 as-ohttp-client = { path = "../../components/as-ohttp-client" }
 
-# Force the "bundled" feature????
-rusqlite = { version = "0.29.0" }
+# For iOS we *do not* want to ship sqlite.
+rusqlite = { version = "0.29.0", features=["in_gecko"] }