aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-05-10 16:18:05 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-05-10 16:18:05 +0000
commitdadc7bb5b111710bec3d4e882290c7790d96dd7c (patch)
tree3a569cb7639bb0a58d73b6613c9054c382801a59
parent93e2e9787ff376ef44812969f84c2b9137067c57 (diff)
parent86af907457a91607f8480e81dd6d51eeb8da5f52 (diff)
downloadbytes-android13-mainline-tzdata4-release.tar.gz
Snap for 10102166 from 86af907457a91607f8480e81dd6d51eeb8da5f52 to mainline-tzdata4-releaseaml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000android13-mainline-tzdata4-releaseaml_tz4_332714010
Change-Id: I6acf770f615d22ecdb93db69a270b784648825fb
-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 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