commit 70e65157e5fd577f47ae5567ec3a29caa3fffcd1
author Colin Cross <ccross@android.com> Thu Sep 22 16:51:25 2022 -0700
committer Steve Elliott <steell@google.com> Fri Oct 28 10:57:11 2022 -0400
tree 91f7a69fcee93c097c7768a9b489852924bde848
parent 4963ba0ae9d1f35c382e659f7fd4b98f12487a1e

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: 239834928
Bug: 247635736
Test: m CtsTranscodeTestAppSupportsHevc
Change-Id: I86cfd735d57b319b7dc362d8dd425cf8dff237d6
Merged-In: I86cfd735d57b319b7dc362d8dd425cf8dff237d6

Android.bp

diff --git a/Android.bp b/Android.bp
index 493cf51..eb9799a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -77,8 +77,10 @@
         "-opt-in=kotlinx.coroutines.InternalCoroutinesApi",
         "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
     ],
-    libs: [
+    static_libs: [
         "kotlinx_coroutines",
+    ],
+    libs: [
         "androidx.annotation_annotation",
     ],
     apex_available: [