Bug 1957640 - Move Megazord.init code to initialize_rust_components

Author: jonalmeida

CHANGELOG.md

@@ -1,5 +1,13 @@
 # v140.0 (In progress)
 
+## ⚠️ Breaking Changes ⚠️
+
+### Android
+- Added `RustComponentsInitializer.kt` to `init_rust_components`.
+
+#### BREAKING CHANGE
+- Removed `Megazord.kt` and moved the contents to the new `RustComponentsInitializer.kt`.
+
 [Full Changelog](In progress)
 
 # v139.0 (_2025-04-28_)

components/autofill/android/src/test/java/mozilla/appservices/autofill/AutofillTest.kt

@@ -1,4 +1,3 @@
-import mozilla.appservices.Megazord
 import mozilla.appservices.autofill.Store
 import mozilla.appservices.syncmanager.SyncManager
 import org.junit.Assert
@@ -17,7 +16,6 @@ class AutofillTest {
     val dbFolder = TemporaryFolder()
 
     fun createTestStore(): Store {
-        Megazord.init()
         val dbPath = dbFolder.newFile()
         return Store(dbpath = dbPath.absolutePath)
     }

components/init_rust_components/android/build.gradle

@@ -3,6 +3,10 @@ apply from: "$appServicesRootDir/publish.gradle"
 
 android {
     namespace 'org.mozilla.appservices.init_rust_components'
+
+    defaultConfig {
+        buildConfigField("String", "LIBRARY_VERSION", "\"${config.componentsVersion}\"")
+    }
 }
 
 ext.configureUniFFIBindgen("init_rust_components")

components/init_rust_components/android/src/main/java/mozilla/appservices/RustComponentsInitializer.kt

@@ -0,0 +1,22 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
+package mozilla.appservices
+
+import mozilla.appservices.init_rust_components.initialize
+import org.mozilla.appservices.init_rust_components.BuildConfig
+
+object RustComponentsInitializer {
+    @JvmStatic
+    fun init() {
+        // Rust components must be initialized at the very beginning, before any other Rust call, ...
+        initialize()
+
+        // This code was originally in the `Megazord.init` that was moved here to have the initialize
+        // done in this particular sequence without needing to have the embedder have to do it within
+        // the application layer.
+        System.setProperty("mozilla.appservices.megazord.library", "megazord")
+        System.setProperty("mozilla.appservices.megazord.version", BuildConfig.LIBRARY_VERSION)
+    }
+}

components/logins/android/src/test/java/mozilla/appservices/logins/DatabaseLoginsStorageTest.kt

@@ -4,7 +4,7 @@
 package mozilla.appservices.logins
 
 import androidx.test.core.app.ApplicationProvider
-import mozilla.appservices.Megazord
+import mozilla.appservices.RustComponentsInitializer
 import mozilla.appservices.syncmanager.SyncManager
 import mozilla.telemetry.glean.testing.GleanTestRule
 import org.junit.Assert.assertEquals
@@ -20,7 +20,6 @@ import org.junit.rules.TemporaryFolder
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
-import mozilla.appservices.init_rust_components.initialize as InitializeRustComponents
 import org.mozilla.appservices.logins.GleanMetrics.LoginsStore as LoginsStoreMetrics
 
 @RunWith(RobolectricTestRunner::class)
@@ -34,8 +33,8 @@ class DatabaseLoginsStorageTest {
     val gleanRule = GleanTestRule(ApplicationProvider.getApplicationContext())
 
     fun createTestStore(): DatabaseLoginsStorage {
-        InitializeRustComponents()
-        Megazord.init()
+        RustComponentsInitializer.init()
+
         val dbPath = dbFolder.newFile()
         val encryptionKey = createKey()
         val keyManager = createStaticKeyManager(key = encryptionKey)

components/places/android/src/test/java/mozilla/appservices/places/PlacesConnectionTest.kt

@@ -5,7 +5,6 @@ package mozilla.appservices.places
 
 import androidx.test.core.app.ApplicationProvider
 import kotlinx.coroutines.runBlocking
-import mozilla.appservices.Megazord
 import mozilla.appservices.places.uniffi.BookmarkItem
 import mozilla.appservices.places.uniffi.DocumentType
 import mozilla.appservices.places.uniffi.FrecencyThresholdOption
@@ -46,7 +45,6 @@ class PlacesConnectionTest {
 
     @Before
     fun initAPI() {
-        Megazord.init()
         api = PlacesApi(path = dbFolder.newFile().absolutePath)
         db = api.getWriter()
     }

components/tabs/android/src/test/java/mozilla/appservices/remotetabs/RemoteTabsTest.kt

@@ -1,9 +1,7 @@
 package mozilla.appservices.remotetabs
 
-import mozilla.appservices.Megazord
 import mozilla.appservices.syncmanager.SyncManager
 import org.junit.Assert
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TemporaryFolder
@@ -18,11 +16,6 @@ class RemoteTabsTest {
     @JvmField
     val dbFolder = TemporaryFolder()
 
-    @Before
-    fun init() {
-        Megazord.init()
-    }
-
     protected fun getTestStore(): TabsStore {
         return TabsStore(path = dbFolder.newFile().absolutePath)
     }

components/webext-storage/android/src/test/java/mozilla/appservices/webextstorage/WebExtStorageTest.kt

@@ -3,7 +3,6 @@
 
 package mozilla.appservices.webextstorage
 
-import mozilla.appservices.Megazord
 import org.junit.Assert
 import org.junit.Rule
 import org.junit.Test
@@ -20,7 +19,6 @@ class WebExtStorageTest {
     val dbFolder = TemporaryFolder()
 
     fun createTestStore(): WebExtStorageStore {
-        Megazord.init()
         val dbPath = dbFolder.newFile()
         return WebExtStorageStore(path = dbPath.absolutePath)
     }

megazords/full/android/build.gradle

@@ -15,7 +15,6 @@ android {
         targetSdkVersion config.targetSdkVersion
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        buildConfigField("String", "LIBRARY_VERSION", "\"${config.componentsVersion}\"")
     }
 
     buildTypes {