From b328dbea8579402769cde55cbd894c49b2da6396 Mon Sep 17 00:00:00 2001
From: oxmc <67136658+oxmc@users.noreply.github.com>
Date: Sat, 18 Jul 2026 01:10:44 -0700
Subject: [PATCH] SetupWizard: link okhttp3 + okio directly to fix R8 missing
 classes

coil-network-okhttp / coil-core declare okhttp3 and okio as static_libs,
but that transitive link (java_import jars through the Coil AAR imports)
does not reach this app's R8 program, so R8 reported okhttp3.*/okio.* as
missing and Coil's OkHttp fetcher would NoClassDefFoundError when loading
network images (device render from deviceInfo[4]). List okhttp3 and okio
directly in static_libs so their classes are in the dex.
---
 Android.bp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Android.bp b/Android.bp
index 2d96c31..2558697 100644
--- a/Android.bp
+++ b/Android.bp
@@ -66,9 +66,15 @@ android_app {
 
         // Images — Coil 3 from prebuilts/application_libs/coil. The network
         // module is mandatory for http(s) image URLs (Coil 3 core ships no
-        // fetcher; the okhttp one self-registers via ServiceLoader) and pulls
-        // okhttp3/okio/coroutines transitively via the import's static_libs.
+        // fetcher; the okhttp one self-registers via ServiceLoader).
         "coil-compose",
         "coil-network-okhttp",
+        // okhttp3/okio are static_libs of coil-network-okhttp/coil-core, but
+        // that transitive link (java_import jars through AAR imports) does not
+        // reach this app's R8 program, leaving okhttp3.*/okio.* as "Missing
+        // class" and breaking network image loading at runtime. List them
+        // directly so they're in the dex.
+        "okhttp3",
+        "okio",
     ],
 }