commit 53eee30fe7306757e7215e6c7b91f4962c6d7e4f
author Colin Cross <ccross@android.com> Thu Jun 23 15:36:42 2022 -0700
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Fri Oct 07 20:05:55 2022 +0000
tree c8de6a6abbb3749afdbcbbcbf750ab590b776b21
parent f77338e072ff28f7d5316dd40fd271ef2293d34a

Update arguments for kotlin 1.7.0

Replace -Xuse-experimental with -opt-in.

Bug: 216136346
Test: builds
Change-Id: I516d54ed009cf2800781006afcb5f340f9d1e32d
(cherry picked from commit 614fe960d4342c43869a56e207247e77eaa93a81)
Merged-In: I516d54ed009cf2800781006afcb5f340f9d1e32d

Android.bp

diff --git a/Android.bp b/Android.bp
index 5225d8c..cc55c17 100644
--- a/Android.bp
+++ b/Android.bp
@@ -54,13 +54,14 @@
     ],
     kotlincflags: [
         "-Xmulti-platform",
-        "-Xuse-experimental=kotlin.ExperimentalMultiplatform",
-        "-Xuse-experimental=kotlin.Experimental",
-        "-Xuse-experimental=kotlin.experimental.ExperimentalTypeInference",
-        "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
-        "-Xuse-experimental=kotlinx.coroutines.FlowPreview",
-        "-Xuse-experimental=kotlinx.coroutines.ObsoleteCoroutinesApi",
-        "-Xuse-experimental=kotlinx.coroutines.InternalCoroutinesApi",
+        "-opt-in=kotlin.RequiresOptIn",
+        "-opt-in=kotlin.experimental.ExperimentalTypeInference",
+        "-opt-in=kotlin.ExperimentalMultiplatform",
+        "-opt-in=kotlinx.coroutines.DelicateCoroutinesApi",
+        "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+        "-opt-in=kotlinx.coroutines.ObsoleteCoroutinesApi",
+        "-opt-in=kotlinx.coroutines.InternalCoroutinesApi",
+        "-opt-in=kotlinx.coroutines.FlowPreview",
     ],
     apex_available: [
         "//apex_available:platform",
@@ -74,8 +75,8 @@
     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",
+        "-opt-in=kotlinx.coroutines.InternalCoroutinesApi",
+        "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
     ],
     libs: [
         "kotlinx_coroutines",
@@ -93,8 +94,8 @@
     srcs: ["kotlinx-coroutines-test/src/**/*.kt"],
     java_resource_dirs: ["kotlinx-coroutines-test/resources"],
     kotlincflags: [
-        "-Xuse-experimental=kotlinx.coroutines.InternalCoroutinesApi",
-        "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
+        "-opt-in=kotlinx.coroutines.InternalCoroutinesApi",
+        "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
     ],
     libs: [
         "kotlinx_coroutines",