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

1 files changed, 3 insertions, 1 deletions

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