aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2021-08-06 23:56:43 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-08-06 23:56:43 +0000
commitd99800c4153e6cf3080dd8ab3efff56f1a6f118d (patch)
tree636b7448083c623ae0933773dff5d69e0af3926e
parent18fcc26ec51de0e03e2afd4f0d6d64dfa1e520ce (diff)
parent60d70a0651786cdac0ade8544880df3154eabc0b (diff)
downloadkotlinx.coroutines-d99800c4153e6cf3080dd8ab3efff56f1a6f118d.tar.gz
Merge "Add missing resources to kotlinx.coroutines jars" am: 08fb69de00 am: 60d70a0651
Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/1784411 Change-Id: I258f16d2127567dbbf2214b4ddbec685236f3df6
-rw-r--r--Android.bp3
1 files changed, 3 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 1537c76d..ecf46f49 100644
--- a/Android.bp
+++ b/Android.bp
@@ -48,6 +48,7 @@ java_library {
"kotlinx-coroutines-core/jvm/src/debug/**/*.kt",
"kotlinx-coroutines-core/jvm/src/test_/TestCoroutineContext.kt",
],
+ java_resource_dirs: ["kotlinx-coroutines-core/jvm/resources"],
static_libs: [
"kotlinx_atomicfu",
],
@@ -67,6 +68,7 @@ java_library {
name: "kotlinx_coroutines_android",
sdk_version: "28",
srcs: ["ui/kotlinx-coroutines-android/src/**/*.kt"],
+ java_resource_dirs: ["ui/kotlinx-coroutines-android/resources"],
kotlincflags: [
"-Xuse-experimental=kotlinx.coroutines.InternalCoroutinesApi",
"-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
@@ -81,6 +83,7 @@ java_library {
name: "kotlinx_coroutines_test",
host_supported: true,
srcs: ["kotlinx-coroutines-test/src/**/*.kt"],
+ java_resource_dirs: ["kotlinx-coroutines-test/resources"],
kotlincflags: [
"-Xuse-experimental=kotlinx.coroutines.InternalCoroutinesApi",
"-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",