aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Geisler <mgeisler@google.com>2023-02-14 09:27:15 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-14 09:27:15 +0000
commit851dae27291501164e6cd0857e98e96ff9ce58e4 (patch)
tree1192b14a0b0124806256c6939ace276a2183b81f
parentc5d986dbe7b220e0feb8fec46cd69f2fbeba07a9 (diff)
parent5309249612fab0f62ebb1ec133ac7ba796d8b5e3 (diff)
downloadbytes-851dae27291501164e6cd0857e98e96ff9ce58e4.tar.gz
bytes: enable “serde” Cargo feature am: 5309249612
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bytes/+/2430595 Change-Id: I2d60a88dc70a6a79757d0ee987ecb70533581ce9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp16
-rw-r--r--cargo2android.json1
2 files changed, 17 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 91d31f6..08a64e9 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.btservices",
diff --git a/cargo2android.json b/cargo2android.json
index 019c739..a77ea80 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