From 86af907457a91607f8480e81dd6d51eeb8da5f52 Mon Sep 17 00:00:00 2001
From: Martin Geisler <mgeisler@google.com>
Date: Wed, 8 Feb 2023 19:14:58 +0100
Subject: =?UTF-8?q?bytes:=20enable=20=E2=80=9Cserde=E2=80=9D=20Cargo=20fea?=
 =?UTF-8?q?ture?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This allows us to serialize and deserialize a Bytes value via Serde.
I’ll be using this for auto-generated PDL tests at first.

This simply allows more code to compile: existing code is unaffected.

Test: presubmit
(cherry picked from https://android-review.googlesource.com/q/commit:5309249612fab0f62ebb1ec133ac7ba796d8b5e3)
Merged-In: I4709fb521feef7ffa519a47a32c80c290974f219
Change-Id: I4709fb521feef7ffa519a47a32c80c290974f219
---
 Android.bp         | 16 ++++++++++++++++
 cargo2android.json |  1 +
 2 files changed, 17 insertions(+)

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",
     ],
 }
@@ -126,6 +128,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"],
@@ -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
-- 
cgit v1.2.3