From 67b5b29c85056c916355cf6bd4658fe306ed2236 Mon Sep 17 00:00:00 2001
From: oxmc <67136658+oxmc@users.noreply.github.com>
Date: Wed, 15 Jul 2026 16:28:16 -0700
Subject: [PATCH] Android.bp: regenerate with maven-to-lib POM-derived
 static_libs

Adds the edges the hand-written graph missed: accompanist-drawablepainter
(real runtime dep of coil-compose-core), appcompat-resources,
profileinstaller, kotlin-stdlib, and the exact lifecycle/coroutines
artifacts from the POMs.
---
 Android.bp | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/Android.bp b/Android.bp
index bf11483..c58b226 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,19 +1,17 @@
-// Coil 3.5.0 (io.coil-kt.coil3) — Kotlin-multiplatform image loading.
-// Gradle-transitive deps are wired as static_libs so consumers only need
-// "coil-compose" (+ "coil-network-okhttp" for http/https image URLs — Coil 3
-// core ships no network fetcher; the okhttp module self-registers through
-// ServiceLoader).
-
 android_library_import {
     name: "coil-core",
     aars: ["coil-core-android.aar"],
     static_libs: [
-        "okio",
-        "kotlinx-coroutines-android",
+        "androidx.annotation_annotation",
+        "androidx.appcompat_appcompat-resources",
         "androidx.core_core-ktx",
-        "androidx.collection_collection-ktx",
-        "androidx.lifecycle_lifecycle-runtime-ktx",
         "androidx.exifinterface_exifinterface",
+        "androidx.lifecycle_lifecycle-runtime",
+        "androidx.profileinstaller_profileinstaller",
+        "kotlin-stdlib",
+        "kotlinx-coroutines-android",
+        "kotlinx-coroutines-core-jvm",
+        "okio",
     ],
     sdk_version: "current",
     min_sdk_version: "36",
@@ -23,7 +21,10 @@ android_library_import {
 android_library_import {
     name: "coil",
     aars: ["coil-android.aar"],
-    static_libs: ["coil-core"],
+    static_libs: [
+        "coil-core",
+        "kotlin-stdlib",
+    ],
     sdk_version: "current",
     min_sdk_version: "36",
     visibility: ["//visibility:public"],
@@ -33,9 +34,10 @@ android_library_import {
     name: "coil-compose-core",
     aars: ["coil-compose-core-android.aar"],
     static_libs: [
-        "coil-core",
+        "accompanist-drawablepainter",
         "androidx.compose.foundation_foundation",
-        "androidx.compose.ui_ui",
+        "coil-core",
+        "kotlin-stdlib",
     ],
     sdk_version: "current",
     min_sdk_version: "36",
@@ -48,6 +50,7 @@ android_library_import {
     static_libs: [
         "coil",
         "coil-compose-core",
+        "kotlin-stdlib",
     ],
     sdk_version: "current",
     min_sdk_version: "36",
@@ -57,7 +60,11 @@ android_library_import {
 android_library_import {
     name: "coil-network-core",
     aars: ["coil-network-core-android.aar"],
-    static_libs: ["coil-core"],
+    static_libs: [
+        "androidx.core_core-ktx",
+        "coil-core",
+        "kotlin-stdlib",
+    ],
     sdk_version: "current",
     min_sdk_version: "36",
     visibility: ["//visibility:public"],
@@ -67,7 +74,9 @@ android_library_import {
     name: "coil-network-okhttp",
     aars: ["coil-network-okhttp-android.aar"],
     static_libs: [
+        "coil-core",
         "coil-network-core",
+        "kotlin-stdlib",
         "okhttp3",
     ],
     sdk_version: "current",