Implement optimization for Android with R8

whyoleg · Aug 12, 2024 · 795000a · 795000a
1 parent 4798a5d
commit 795000a
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/sweetspi-runtime/src/jvmMain/kotlin/InternalServiceLoader.jvm.kt b/sweetspi-runtime/src/jvmMain/kotlin/InternalServiceLoader.jvm.kt
@@ -9,7 +9,17 @@ import java.util.*
 @JvmField
 @InternalSweetSpiApi
 internal actual val internalServiceLoader: Lazy<InternalServiceLoader> = lazy {
-    InternalServiceLoader(ServiceLoader.load(InternalServiceModule::class.java).toList())
+    val modules = Iterable {
+        // ServiceLoader should use specific call convention to be optimized by R8 on Android:
+        // `ServiceLoader.load(X.class, X.class.getClassLoader()).iterator()`
+        // source:
+        // https://r8.googlesource.com/r8/+/refs/heads/main/src/main/java/com/android/tools/r8/ir/optimize/ServiceLoaderRewriter.java
+        ServiceLoader.load(
+            InternalServiceModule::class.java,
+            InternalServiceModule::class.java.classLoader
+        ).iterator()
+    }.toList()
+    InternalServiceLoader(modules)
 }
 
 // IDEA shows an error because of a wrong visibility inspection