Enable the serde_cbor tags feature
This feature makes de/serializing tagged data simple and reliable.
Without it, kludgy work-arounds are needed for tagged values.
Test: serde_cbor_host_test_tests_tags, serde_cbor_device_test_tests_tags
Change-Id: I291ef2052d32c9c14a8188fa0a97883c6d50acd6
diff --git a/Android.bp b/Android.bp
index 13af8c9..de077fe 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies --tests.
+// This file is generated by cargo2android.py --run --device --dependencies --tests --features default,tags.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -41,11 +41,14 @@
name: "libserde_cbor",
host_supported: true,
crate_name: "serde_cbor",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.11.1",
srcs: ["src/lib.rs"],
edition: "2018",
features: [
"default",
"std",
+ "tags",
],
rustlibs: [
"libhalf",
@@ -54,15 +57,18 @@
}
rust_defaults {
- name: "serde_cbor_defaults",
+ name: "serde_cbor_test_defaults",
crate_name: "serde_cbor",
srcs: ["src/lib.rs"],
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.11.1",
test_suites: ["general-tests"],
auto_gen_config: true,
edition: "2018",
features: [
"default",
"std",
+ "tags",
],
rustlibs: [
"libhalf",
@@ -73,7 +79,7 @@
rust_test_host {
name: "serde_cbor_host_test_src_lib",
- defaults: ["serde_cbor_defaults"],
+ defaults: ["serde_cbor_test_defaults"],
test_options: {
unit_test: true,
},
@@ -81,18 +87,21 @@
rust_test {
name: "serde_cbor_device_test_src_lib",
- defaults: ["serde_cbor_defaults"],
+ defaults: ["serde_cbor_test_defaults"],
}
rust_defaults {
- name: "serde_cbor_defaults_serde_cbor",
+ name: "serde_cbor_test_defaults_serde_cbor",
crate_name: "serde_cbor",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.11.1",
test_suites: ["general-tests"],
auto_gen_config: true,
edition: "2018",
features: [
"default",
"std",
+ "tags",
],
rustlibs: [
"libhalf",
@@ -104,7 +113,7 @@
rust_test_host {
name: "serde_cbor_host_test_tests_bennofs",
- defaults: ["serde_cbor_defaults_serde_cbor"],
+ defaults: ["serde_cbor_test_defaults_serde_cbor"],
srcs: ["tests/bennofs.rs"],
test_options: {
unit_test: true,
@@ -113,13 +122,13 @@
rust_test {
name: "serde_cbor_device_test_tests_bennofs",
- defaults: ["serde_cbor_defaults_serde_cbor"],
+ defaults: ["serde_cbor_test_defaults_serde_cbor"],
srcs: ["tests/bennofs.rs"],
}
rust_test_host {
name: "serde_cbor_host_test_tests_canonical",
- defaults: ["serde_cbor_defaults_serde_cbor"],
+ defaults: ["serde_cbor_test_defaults_serde_cbor"],
srcs: ["tests/canonical.rs"],
test_options: {
unit_test: true,
@@ -128,13 +137,13 @@
rust_test {
name: "serde_cbor_device_test_tests_canonical",
- defaults: ["serde_cbor_defaults_serde_cbor"],
+ defaults: ["serde_cbor_test_defaults_serde_cbor"],
srcs: ["tests/canonical.rs"],
}
rust_test_host {
name: "serde_cbor_host_test_tests_de",
- defaults: ["serde_cbor_defaults_serde_cbor"],
+ defaults: ["serde_cbor_test_defaults_serde_cbor"],
srcs: ["tests/de.rs"],
test_options: {
unit_test: true,
@@ -143,13 +152,13 @@
rust_test {
name: "serde_cbor_device_test_tests_de",
- defaults: ["serde_cbor_defaults_serde_cbor"],
+ defaults: ["serde_cbor_test_defaults_serde_cbor"],
srcs: ["tests/de.rs"],
}
rust_test_host {
name: "serde_cbor_host_test_tests_enum",
- defaults: ["serde_cbor_defaults_serde_cbor"],
+ defaults: ["serde_cbor_test_defaults_serde_cbor"],
srcs: ["tests/enum.rs"],
test_options: {
unit_test: true,
@@ -158,13 +167,13 @@
rust_test {
name: "serde_cbor_device_test_tests_enum",
- defaults: ["serde_cbor_defaults_serde_cbor"],
+ defaults: ["serde_cbor_test_defaults_serde_cbor"],
srcs: ["tests/enum.rs"],
}
rust_test_host {
name: "serde_cbor_host_test_tests_ser",
- defaults: ["serde_cbor_defaults_serde_cbor"],
+ defaults: ["serde_cbor_test_defaults_serde_cbor"],
srcs: ["tests/ser.rs"],
test_options: {
unit_test: true,
@@ -173,13 +182,13 @@
rust_test {
name: "serde_cbor_device_test_tests_ser",
- defaults: ["serde_cbor_defaults_serde_cbor"],
+ defaults: ["serde_cbor_test_defaults_serde_cbor"],
srcs: ["tests/ser.rs"],
}
rust_test_host {
name: "serde_cbor_host_test_tests_std_types",
- defaults: ["serde_cbor_defaults_serde_cbor"],
+ defaults: ["serde_cbor_test_defaults_serde_cbor"],
srcs: ["tests/std_types.rs"],
test_options: {
unit_test: true,
@@ -188,13 +197,13 @@
rust_test {
name: "serde_cbor_device_test_tests_std_types",
- defaults: ["serde_cbor_defaults_serde_cbor"],
+ defaults: ["serde_cbor_test_defaults_serde_cbor"],
srcs: ["tests/std_types.rs"],
}
rust_test_host {
name: "serde_cbor_host_test_tests_tags",
- defaults: ["serde_cbor_defaults_serde_cbor"],
+ defaults: ["serde_cbor_test_defaults_serde_cbor"],
srcs: ["tests/tags.rs"],
test_options: {
unit_test: true,
@@ -203,13 +212,13 @@
rust_test {
name: "serde_cbor_device_test_tests_tags",
- defaults: ["serde_cbor_defaults_serde_cbor"],
+ defaults: ["serde_cbor_test_defaults_serde_cbor"],
srcs: ["tests/tags.rs"],
}
rust_test_host {
name: "serde_cbor_host_test_tests_value",
- defaults: ["serde_cbor_defaults_serde_cbor"],
+ defaults: ["serde_cbor_test_defaults_serde_cbor"],
srcs: ["tests/value.rs"],
test_options: {
unit_test: true,
@@ -218,15 +227,6 @@
rust_test {
name: "serde_cbor_device_test_tests_value",
- defaults: ["serde_cbor_defaults_serde_cbor"],
+ defaults: ["serde_cbor_test_defaults_serde_cbor"],
srcs: ["tests/value.rs"],
}
-
-// dependent_library ["feature_list"]
-// half-1.7.1
-// proc-macro2-1.0.24 "default,proc-macro"
-// quote-1.0.9 "default,proc-macro"
-// serde-1.0.123 "std"
-// serde_derive-1.0.123
-// syn-1.0.61 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
-// unicode-xid-0.2.1 "default"
