Add aliases for kotlinx.coroutines libraries
There was a separate copy of the kotlinx.coroutines libraries
in prebuilts/tools/common/m2/repository. Replace those with
aliases to the platform libraries to avoid ODR issues.
Requires adding apex_available to the platform libraries as the
prebuilts were already marked apex_available.
Test: m checkbuild
Change-Id: Ic927773923b64920a445b7a7a889b112a44bbdfe
diff --git a/Android.bp b/Android.bp
index 1537c76..725e217 100644
--- a/Android.bp
+++ b/Android.bp
@@ -61,6 +61,10 @@
"-Xuse-experimental=kotlinx.coroutines.ObsoleteCoroutinesApi",
"-Xuse-experimental=kotlinx.coroutines.InternalCoroutinesApi",
],
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex"
+ ],
}
java_library {
@@ -75,6 +79,10 @@
"kotlinx_coroutines",
"androidx.annotation_annotation",
],
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex"
+ ],
}
java_library {
@@ -88,4 +96,45 @@
libs: [
"kotlinx_coroutines",
],
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex"
+ ],
+}
+
+// Temporary aliases for kotlinx-coroutines-core, kotlinx-coroutines-core-jvm and kotlinx-coroutines-android
+
+java_library {
+ name: "kotlinx-coroutines-core",
+ host_supported: true,
+ sdk_version: "28",
+ static_libs: ["kotlinx_coroutines"],
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex"
+ ],
+}
+
+java_library {
+ name: "kotlinx-coroutines-core-jvm",
+ host_supported: true,
+ sdk_version: "28",
+ static_libs: ["kotlinx_coroutines"],
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex"
+ ],
+}
+
+java_library {
+ name: "kotlinx-coroutines-android",
+ sdk_version: "28",
+ static_libs: [
+ "kotlinx_coroutines_android",
+ "kotlinx_coroutines",
+ ],
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex"
+ ],
}