Snap for 11662267 from 2d7016755c5e82703f12c72c00aa52e5bcd565ad to sdk-releaseplatform-tools-35.0.1

Change-Id: I15e913df7b1aac1ee3b6c96dc4fb25eaae8ef523

1 files changed, 18 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index 58c350d0..cca69f02 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,11 +2,25 @@ java_library {
     name: "kotlinx_serialization",
     host_supported: true,
     sdk_version: "core_current",
-    srcs: ["kotlinx-serialization-core/jvmMain/src/kotlinx/serialization/**/*.kt"],
-    common_srcs: ["kotlinx-serialization-core/commonMain/src/kotlinx/serialization/**/*.kt"],
+    srcs: ["core/jvmMain/src/kotlinx/serialization/**/*.kt"],
+    common_srcs: ["core/commonMain/src/kotlinx/serialization/**/*.kt"],
     kotlincflags: [
         "-Xmulti-platform",
-        "-Xuse-experimental=kotlinx.serialization.ExperimentalSerializationApi",
-        "-Xuse-experimental=kotlinx.serialization.InternalSerializationApi",
+        "-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
+        "-opt-in=kotlinx.serialization.InternalSerializationApi",
     ],
 }
+
+java_library {
+    name: "kotlinx_serialization_json",
+    host_supported: true,
+    sdk_version: "core_current",
+    srcs: ["formats/json/jvmMain/src/kotlinx/serialization/**/*.kt"],
+    common_srcs: ["formats/json/commonMain/src/kotlinx/serialization/**/*.kt"],
+    kotlincflags: [
+        "-Xmulti-platform",
+        "-opt-in=kotlinx.serialization.ExperimentalSerializationApi",
+        "-opt-in=kotlinx.serialization.InternalSerializationApi",
+    ],
+    static_libs: ["kotlinx_serialization"],
+}