From f174609ee266218cd339be41ebbae48973ff4c7d Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 22 Sep 2022 16:51:25 -0700
Subject: Statically include kotlinx_coroutines into kotlinx_coroutines_android

kotlinx_coroutines_android classes reference kotlinx_coroutines
classes, and including kotlinx_coroutines_android without
kotlinx_coroutines causes missing classes warnings in R8.
Statically include kotlinx_coroutines into kotlinx_coroutines_android.

Bug: 247635736
Test: m CtsTranscodeTestAppSupportsHevc
Change-Id: I86cfd735d57b319b7dc362d8dd425cf8dff237d6
---
 Android.bp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index 71db17f1..67eea5ae 100644
--- a/Android.bp
+++ b/Android.bp
@@ -76,8 +76,10 @@ java_library {
         "-Xuse-experimental=kotlinx.coroutines.InternalCoroutinesApi",
         "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
     ],
-    libs: [
+    static_libs: [
         "kotlinx_coroutines",
+    ],
+    libs: [
         "androidx.annotation_annotation",
     ],
     apex_available: [
-- 
cgit v1.2.3