Add back missing tests. am: 0afc9ae59d am: 9439ba55a6 am: 9ae5792e1f am: 014409ce68

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bytes/+/1886392

Change-Id: Ic3862a15d90f776c45e76c94d8a25dd72b765e59

1 files changed, 66 insertions, 20 deletions

diff --git a/Android.bp b/Android.bp
index 08266c5..7000e0e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,6 +21,37 @@ license {
 rust_defaults {
     name: "bytes_test_defaults",
     crate_name: "bytes",
+    srcs: ["src/lib.rs"],
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.1.0",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    rustlibs: [
+        "libserde_test",
+    ],
+}
+
+rust_test_host {
+    name: "bytes_host_test_src_lib",
+    defaults: ["bytes_test_defaults"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "bytes_device_test_src_lib",
+    defaults: ["bytes_test_defaults"],
+}
+
+rust_defaults {
+    name: "bytes_test_defaults_bytes",
+    crate_name: "bytes",
     cargo_env_compat: true,
     cargo_pkg_version: "1.1.0",
     test_suites: ["general-tests"],
@@ -38,7 +69,7 @@ rust_defaults {
 
 rust_test_host {
     name: "bytes_host_test_tests_test_buf",
-    defaults: ["bytes_test_defaults"],
+    defaults: ["bytes_test_defaults_bytes"],
     srcs: ["tests/test_buf.rs"],
     test_options: {
         unit_test: true,
@@ -47,13 +78,13 @@ rust_test_host {
 
 rust_test {
     name: "bytes_device_test_tests_test_buf",
-    defaults: ["bytes_test_defaults"],
+    defaults: ["bytes_test_defaults_bytes"],
     srcs: ["tests/test_buf.rs"],
 }
 
 rust_test_host {
     name: "bytes_host_test_tests_test_buf_mut",
-    defaults: ["bytes_test_defaults"],
+    defaults: ["bytes_test_defaults_bytes"],
     srcs: ["tests/test_buf_mut.rs"],
     test_options: {
         unit_test: true,
@@ -62,13 +93,13 @@ rust_test_host {
 
 rust_test {
     name: "bytes_device_test_tests_test_buf_mut",
-    defaults: ["bytes_test_defaults"],
+    defaults: ["bytes_test_defaults_bytes"],
     srcs: ["tests/test_buf_mut.rs"],
 }
 
 rust_test_host {
     name: "bytes_host_test_tests_test_bytes",
-    defaults: ["bytes_test_defaults"],
+    defaults: ["bytes_test_defaults_bytes"],
     srcs: ["tests/test_bytes.rs"],
     test_options: {
         unit_test: true,
@@ -77,13 +108,13 @@ rust_test_host {
 
 rust_test {
     name: "bytes_device_test_tests_test_bytes",
-    defaults: ["bytes_test_defaults"],
+    defaults: ["bytes_test_defaults_bytes"],
     srcs: ["tests/test_bytes.rs"],
 }
 
 rust_test_host {
     name: "bytes_host_test_tests_test_bytes_odd_alloc",
-    defaults: ["bytes_test_defaults"],
+    defaults: ["bytes_test_defaults_bytes"],
     srcs: ["tests/test_bytes_odd_alloc.rs"],
     test_options: {
         unit_test: true,
@@ -92,13 +123,13 @@ rust_test_host {
 
 rust_test {
     name: "bytes_device_test_tests_test_bytes_odd_alloc",
-    defaults: ["bytes_test_defaults"],
+    defaults: ["bytes_test_defaults_bytes"],
     srcs: ["tests/test_bytes_odd_alloc.rs"],
 }
 
 rust_test_host {
     name: "bytes_host_test_tests_test_bytes_vec_alloc",
-    defaults: ["bytes_test_defaults"],
+    defaults: ["bytes_test_defaults_bytes"],
     srcs: ["tests/test_bytes_vec_alloc.rs"],
     test_options: {
         unit_test: true,
@@ -107,13 +138,13 @@ rust_test_host {
 
 rust_test {
     name: "bytes_device_test_tests_test_bytes_vec_alloc",
-    defaults: ["bytes_test_defaults"],
+    defaults: ["bytes_test_defaults_bytes"],
     srcs: ["tests/test_bytes_vec_alloc.rs"],
 }
 
 rust_test_host {
     name: "bytes_host_test_tests_test_chain",
-    defaults: ["bytes_test_defaults"],
+    defaults: ["bytes_test_defaults_bytes"],
     srcs: ["tests/test_chain.rs"],
     test_options: {
         unit_test: true,
@@ -122,13 +153,13 @@ rust_test_host {
 
 rust_test {
     name: "bytes_device_test_tests_test_chain",
-    defaults: ["bytes_test_defaults"],
+    defaults: ["bytes_test_defaults_bytes"],
     srcs: ["tests/test_chain.rs"],
 }
 
 rust_test_host {
     name: "bytes_host_test_tests_test_debug",
-    defaults: ["bytes_test_defaults"],
+    defaults: ["bytes_test_defaults_bytes"],
     srcs: ["tests/test_debug.rs"],
     test_options: {
         unit_test: true,
@@ -137,13 +168,13 @@ rust_test_host {
 
 rust_test {
     name: "bytes_device_test_tests_test_debug",
-    defaults: ["bytes_test_defaults"],
+    defaults: ["bytes_test_defaults_bytes"],
     srcs: ["tests/test_debug.rs"],
 }
 
 rust_test_host {
     name: "bytes_host_test_tests_test_iter",
-    defaults: ["bytes_test_defaults"],
+    defaults: ["bytes_test_defaults_bytes"],
     srcs: ["tests/test_iter.rs"],
     test_options: {
         unit_test: true,
@@ -152,13 +183,13 @@ rust_test_host {
 
 rust_test {
     name: "bytes_device_test_tests_test_iter",
-    defaults: ["bytes_test_defaults"],
+    defaults: ["bytes_test_defaults_bytes"],
     srcs: ["tests/test_iter.rs"],
 }
 
 rust_test_host {
     name: "bytes_host_test_tests_test_reader",
-    defaults: ["bytes_test_defaults"],
+    defaults: ["bytes_test_defaults_bytes"],
     srcs: ["tests/test_reader.rs"],
     test_options: {
         unit_test: true,
@@ -167,13 +198,28 @@ rust_test_host {
 
 rust_test {
     name: "bytes_device_test_tests_test_reader",
-    defaults: ["bytes_test_defaults"],
+    defaults: ["bytes_test_defaults_bytes"],
     srcs: ["tests/test_reader.rs"],
 }
 
 rust_test_host {
+    name: "bytes_host_test_tests_test_serde",
+    defaults: ["bytes_test_defaults_bytes"],
+    srcs: ["tests/test_serde.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "bytes_device_test_tests_test_serde",
+    defaults: ["bytes_test_defaults_bytes"],
+    srcs: ["tests/test_serde.rs"],
+}
+
+rust_test_host {
     name: "bytes_host_test_tests_test_take",
-    defaults: ["bytes_test_defaults"],
+    defaults: ["bytes_test_defaults_bytes"],
     srcs: ["tests/test_take.rs"],
     test_options: {
         unit_test: true,
@@ -182,7 +228,7 @@ rust_test_host {
 
 rust_test {
     name: "bytes_device_test_tests_test_take",
-    defaults: ["bytes_test_defaults"],
+    defaults: ["bytes_test_defaults_bytes"],
     srcs: ["tests/test_take.rs"],
 }