Snap for 9772430 from 86af907457a91607f8480e81dd6d51eeb8da5f52 to mainline-media-releaseaml_med_331911000

Change-Id: I5caa6c4ec9be8a2eb90a27675366e28ca3adfabc

2 files changed, 17 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 97dc970..1909ec1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -28,10 +28,12 @@ rust_defaults {
     edition: "2018",
     features: [
         "default",
+        "serde",
         "std",
     ],
     rustlibs: [
         "libbytes",
+        "libserde",
         "libserde_test",
     ],
 }
@@ -127,6 +129,16 @@ rust_test {
 }
 
 rust_test {
+    name: "bytes_test_tests_test_serde",
+    defaults: ["bytes_test_defaults"],
+    host_supported: true,
+    srcs: ["tests/test_serde.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
     name: "bytes_test_tests_test_take",
     defaults: ["bytes_test_defaults"],
     host_supported: true,
@@ -146,8 +158,12 @@ rust_library {
     edition: "2018",
     features: [
         "default",
+        "serde",
         "std",
     ],
+    rustlibs: [
+        "libserde",
+    ],
     apex_available: [
         "//apex_available:platform",
         "com.android.bluetooth",
diff --git a/cargo2android.json b/cargo2android.json
index 19c5df8..3f01463 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -10,6 +10,7 @@
   "dependencies": true,
   "device": true,
   "min-sdk-version": "29",
+  "features": "default,serde",
   "run": true,
   "tests": true,
   "vendor-available": true