From 12f62b94d6ccdca90dcd0edfbff82031fec3912f Mon Sep 17 00:00:00 2001
From: Joel Galenson <jgalenson@google.com>
Date: Wed, 22 Sep 2021 10:51:41 -0700
Subject: Upgrade rust/crates/bytes to 1.1.0

Test: make
Change-Id: I62c795247b1a9f37ec66c3ef6b1add6b78530482
---
 Android.bp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Android.bp')

diff --git a/Android.bp b/Android.bp
index 4d22da0..1355891 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,6 +22,8 @@ rust_library {
     name: "libbytes",
     host_supported: true,
     crate_name: "bytes",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.1.0",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: [
-- 
cgit v1.2.3


From 1b3445f64d26d631b0b9b296aa9a8d921791eaf7 Mon Sep 17 00:00:00 2001
From: Jeff Vander Stoep <jeffv@google.com>
Date: Fri, 15 Oct 2021 13:42:26 +0200
Subject: Enable tests in Android CI

Disable one test, split_off_to_at_gt_len, that fails because Android
does unwinding differently than it expects.

Test: atest
bytes_host_test_tests_test_buf: Passed: 9, Failed: 0, Ignored: 0, Assumption Failed: 0,
bytes_host_test_tests_test_buf_mut: Passed: 16, Failed: 0, Ignored: 0, Assumption Failed: 0,
bytes_host_test_tests_test_bytes: Passed: 68, Failed: 0, Ignored: 1, Assumption Failed: 0,
bytes_host_test_tests_test_bytes_odd_alloc: Passed: 3, Failed: 0, Ignored: 0, Assumption Failed: 0,
bytes_host_test_tests_test_bytes_vec_alloc: Passed: 3, Failed: 0, Ignored: 0, Assumption Failed: 0,
bytes_host_test_tests_test_chain: Passed: 5, Failed: 0, Ignored: 0, Assumption Failed: 0,
bytes_host_test_tests_test_debug: Passed: 1, Failed: 0, Ignored: 0, Assumption Failed: 0,
bytes_host_test_tests_test_iter: Passed: 2, Failed: 0, Ignored: 0, Assumption Failed: 0,
bytes_host_test_tests_test_reader: Passed: 2, Failed: 0, Ignored: 0, Assumption Failed: 0,
bytes_host_test_tests_test_take: Passed: 3, Failed: 0, Ignored: 0, Assumption Failed: 0,
bytes_device_test_tests_test_buf: Passed: 9, Failed: 0, Ignored: 0, Assumption Failed: 0,
bytes_device_test_tests_test_buf_mut: Passed: 16, Failed: 0, Ignored: 0, Assumption Failed: 0,
bytes_device_test_tests_test_bytes: Passed: 68, Failed: 0, Ignored: 1, Assumption Failed: 0,
bytes_device_test_tests_test_bytes_odd_alloc: Passed: 3, Failed: 0, Ignored: 0, Assumption Failed: 0,
bytes_device_test_tests_test_bytes_vec_alloc: Passed: 3, Failed: 0, Ignored: 0, Assumption Failed: 0,
bytes_device_test_tests_test_chain: Passed: 5, Failed: 0, Ignored: 0, Assumption Failed: 0,
bytes_device_test_tests_test_debug: Passed: 1, Failed: 0, Ignored: 0, Assumption Failed: 0,
bytes_device_test_tests_test_iter: Passed: 2, Failed: 0, Ignored: 0, Assumption Failed: 0,
bytes_device_test_tests_test_reader: Passed: 2, Failed: 0, Ignored: 0, Assumption Failed: 0,
bytes_device_test_tests_test_take: Passed: 3, Failed: 0, Ignored: 0, Assumption Failed: 0,

Change-Id: I76aed871d3aadef824b49f65a9e3aecd7a7d645f
---
 Android.bp | 214 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 214 insertions(+)

(limited to 'Android.bp')

diff --git a/Android.bp b/Android.bp
index 1355891..1217d33 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,6 +18,220 @@ 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"],
+    auto_gen_config: true,
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    rustlibs: [
+        "libbytes",
+        "libserde_test",
+    ],
+}
+
+rust_test_host {
+    name: "bytes_host_test_tests_test_buf",
+    defaults: ["bytes_test_defaults_bytes"],
+    srcs: ["tests/test_buf.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "bytes_device_test_tests_test_buf",
+    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_bytes"],
+    srcs: ["tests/test_buf_mut.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "bytes_device_test_tests_test_buf_mut",
+    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_bytes"],
+    srcs: ["tests/test_bytes.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "bytes_device_test_tests_test_bytes",
+    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_bytes"],
+    srcs: ["tests/test_bytes_odd_alloc.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "bytes_device_test_tests_test_bytes_odd_alloc",
+    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_bytes"],
+    srcs: ["tests/test_bytes_vec_alloc.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "bytes_device_test_tests_test_bytes_vec_alloc",
+    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_bytes"],
+    srcs: ["tests/test_chain.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "bytes_device_test_tests_test_chain",
+    defaults: ["bytes_test_defaults_bytes"],
+    srcs: ["tests/test_chain.rs"],
+}
+
+rust_test_host {
+    name: "bytes_host_test_tests_test_debug",
+    defaults: ["bytes_test_defaults_bytes"],
+    srcs: ["tests/test_debug.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "bytes_device_test_tests_test_debug",
+    defaults: ["bytes_test_defaults_bytes"],
+    srcs: ["tests/test_debug.rs"],
+}
+
+rust_test_host {
+    name: "bytes_host_test_tests_test_iter",
+    defaults: ["bytes_test_defaults_bytes"],
+    srcs: ["tests/test_iter.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "bytes_device_test_tests_test_iter",
+    defaults: ["bytes_test_defaults_bytes"],
+    srcs: ["tests/test_iter.rs"],
+}
+
+rust_test_host {
+    name: "bytes_host_test_tests_test_reader",
+    defaults: ["bytes_test_defaults_bytes"],
+    srcs: ["tests/test_reader.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "bytes_device_test_tests_test_reader",
+    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_bytes"],
+    srcs: ["tests/test_take.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "bytes_device_test_tests_test_take",
+    defaults: ["bytes_test_defaults_bytes"],
+    srcs: ["tests/test_take.rs"],
+}
+
 rust_library {
     name: "libbytes",
     host_supported: true,
-- 
cgit v1.2.3


From bd87b64fbfd1f4f0e681096514a89167a393d8c4 Mon Sep 17 00:00:00 2001
From: Joel Galenson <jgalenson@google.com>
Date: Thu, 28 Oct 2021 15:17:12 -0700
Subject: Add apex_available.

The test changes are side effects due to rerunning cargo2android.py.

Test: None
Change-Id: Ib5c3668115bab6117334b8135f2ea5d69b3f976a
---
 Android.bp | 87 +++++++++++++++-----------------------------------------------
 1 file changed, 21 insertions(+), 66 deletions(-)

(limited to 'Android.bp')

diff --git a/Android.bp b/Android.bp
index 1217d33..08266c5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,37 +21,6 @@ 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"],
@@ -69,7 +38,7 @@ rust_defaults {
 
 rust_test_host {
     name: "bytes_host_test_tests_test_buf",
-    defaults: ["bytes_test_defaults_bytes"],
+    defaults: ["bytes_test_defaults"],
     srcs: ["tests/test_buf.rs"],
     test_options: {
         unit_test: true,
@@ -78,13 +47,13 @@ rust_test_host {
 
 rust_test {
     name: "bytes_device_test_tests_test_buf",
-    defaults: ["bytes_test_defaults_bytes"],
+    defaults: ["bytes_test_defaults"],
     srcs: ["tests/test_buf.rs"],
 }
 
 rust_test_host {
     name: "bytes_host_test_tests_test_buf_mut",
-    defaults: ["bytes_test_defaults_bytes"],
+    defaults: ["bytes_test_defaults"],
     srcs: ["tests/test_buf_mut.rs"],
     test_options: {
         unit_test: true,
@@ -93,13 +62,13 @@ rust_test_host {
 
 rust_test {
     name: "bytes_device_test_tests_test_buf_mut",
-    defaults: ["bytes_test_defaults_bytes"],
+    defaults: ["bytes_test_defaults"],
     srcs: ["tests/test_buf_mut.rs"],
 }
 
 rust_test_host {
     name: "bytes_host_test_tests_test_bytes",
-    defaults: ["bytes_test_defaults_bytes"],
+    defaults: ["bytes_test_defaults"],
     srcs: ["tests/test_bytes.rs"],
     test_options: {
         unit_test: true,
@@ -108,13 +77,13 @@ rust_test_host {
 
 rust_test {
     name: "bytes_device_test_tests_test_bytes",
-    defaults: ["bytes_test_defaults_bytes"],
+    defaults: ["bytes_test_defaults"],
     srcs: ["tests/test_bytes.rs"],
 }
 
 rust_test_host {
     name: "bytes_host_test_tests_test_bytes_odd_alloc",
-    defaults: ["bytes_test_defaults_bytes"],
+    defaults: ["bytes_test_defaults"],
     srcs: ["tests/test_bytes_odd_alloc.rs"],
     test_options: {
         unit_test: true,
@@ -123,13 +92,13 @@ rust_test_host {
 
 rust_test {
     name: "bytes_device_test_tests_test_bytes_odd_alloc",
-    defaults: ["bytes_test_defaults_bytes"],
+    defaults: ["bytes_test_defaults"],
     srcs: ["tests/test_bytes_odd_alloc.rs"],
 }
 
 rust_test_host {
     name: "bytes_host_test_tests_test_bytes_vec_alloc",
-    defaults: ["bytes_test_defaults_bytes"],
+    defaults: ["bytes_test_defaults"],
     srcs: ["tests/test_bytes_vec_alloc.rs"],
     test_options: {
         unit_test: true,
@@ -138,13 +107,13 @@ rust_test_host {
 
 rust_test {
     name: "bytes_device_test_tests_test_bytes_vec_alloc",
-    defaults: ["bytes_test_defaults_bytes"],
+    defaults: ["bytes_test_defaults"],
     srcs: ["tests/test_bytes_vec_alloc.rs"],
 }
 
 rust_test_host {
     name: "bytes_host_test_tests_test_chain",
-    defaults: ["bytes_test_defaults_bytes"],
+    defaults: ["bytes_test_defaults"],
     srcs: ["tests/test_chain.rs"],
     test_options: {
         unit_test: true,
@@ -153,13 +122,13 @@ rust_test_host {
 
 rust_test {
     name: "bytes_device_test_tests_test_chain",
-    defaults: ["bytes_test_defaults_bytes"],
+    defaults: ["bytes_test_defaults"],
     srcs: ["tests/test_chain.rs"],
 }
 
 rust_test_host {
     name: "bytes_host_test_tests_test_debug",
-    defaults: ["bytes_test_defaults_bytes"],
+    defaults: ["bytes_test_defaults"],
     srcs: ["tests/test_debug.rs"],
     test_options: {
         unit_test: true,
@@ -168,13 +137,13 @@ rust_test_host {
 
 rust_test {
     name: "bytes_device_test_tests_test_debug",
-    defaults: ["bytes_test_defaults_bytes"],
+    defaults: ["bytes_test_defaults"],
     srcs: ["tests/test_debug.rs"],
 }
 
 rust_test_host {
     name: "bytes_host_test_tests_test_iter",
-    defaults: ["bytes_test_defaults_bytes"],
+    defaults: ["bytes_test_defaults"],
     srcs: ["tests/test_iter.rs"],
     test_options: {
         unit_test: true,
@@ -183,13 +152,13 @@ rust_test_host {
 
 rust_test {
     name: "bytes_device_test_tests_test_iter",
-    defaults: ["bytes_test_defaults_bytes"],
+    defaults: ["bytes_test_defaults"],
     srcs: ["tests/test_iter.rs"],
 }
 
 rust_test_host {
     name: "bytes_host_test_tests_test_reader",
-    defaults: ["bytes_test_defaults_bytes"],
+    defaults: ["bytes_test_defaults"],
     srcs: ["tests/test_reader.rs"],
     test_options: {
         unit_test: true,
@@ -198,28 +167,13 @@ rust_test_host {
 
 rust_test {
     name: "bytes_device_test_tests_test_reader",
-    defaults: ["bytes_test_defaults_bytes"],
+    defaults: ["bytes_test_defaults"],
     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_bytes"],
+    defaults: ["bytes_test_defaults"],
     srcs: ["tests/test_take.rs"],
     test_options: {
         unit_test: true,
@@ -228,7 +182,7 @@ rust_test_host {
 
 rust_test {
     name: "bytes_device_test_tests_test_take",
-    defaults: ["bytes_test_defaults_bytes"],
+    defaults: ["bytes_test_defaults"],
     srcs: ["tests/test_take.rs"],
 }
 
@@ -247,6 +201,7 @@ rust_library {
     apex_available: [
         "//apex_available:platform",
         "com.android.resolv",
+        "com.android.uwb",
         "com.android.virt",
     ],
     min_sdk_version: "29",
-- 
cgit v1.2.3


From 0afc9ae59d82e9f313bc499cb957184f0bad2acd Mon Sep 17 00:00:00 2001
From: Joel Galenson <jgalenson@google.com>
Date: Wed, 10 Nov 2021 08:41:44 -0800
Subject: Add back missing tests.

Test: TreeHugger
Change-Id: I87ae63757e3870208aa41e0d1aad2244f1f05ec4
---
 Android.bp | 86 +++++++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 66 insertions(+), 20 deletions(-)

(limited to 'Android.bp')

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"],
 }
 
-- 
cgit v1.2.3


From c831f85db1f54389ecb4f9996d2ff636f0e39e54 Mon Sep 17 00:00:00 2001
From: Alan Stokes <alanstokes@google.com>
Date: Wed, 8 Dec 2021 16:01:08 +0000
Subject: Make libbytes available to CompOS

Bug: 161471326
Test: Builds
Change-Id: Ib1bff746a2b0a53b0181c9cf28b676764888a07f
---
 Android.bp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Android.bp')

diff --git a/Android.bp b/Android.bp
index 7000e0e..be6d9b5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -246,6 +246,7 @@ rust_library {
     ],
     apex_available: [
         "//apex_available:platform",
+        "com.android.compos",
         "com.android.resolv",
         "com.android.uwb",
         "com.android.virt",
-- 
cgit v1.2.3


From 2901ba95e3a5eb76845b5a48bc439f6a1e2adc34 Mon Sep 17 00:00:00 2001
From: Joel Galenson <jgalenson@google.com>
Date: Mon, 29 Nov 2021 14:03:13 -0800
Subject: Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Test: None
Change-Id: Icaae14464070d095be9bbbba53ca09b16b6d46f6
---
 Android.bp | 156 ++++++++++++-------------------------------------------------
 1 file changed, 30 insertions(+), 126 deletions(-)

(limited to 'Android.bp')

diff --git a/Android.bp b/Android.bp
index 7000e0e..b723165 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,37 +21,6 @@ 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"],
@@ -67,171 +36,106 @@ rust_defaults {
     ],
 }
 
-rust_test_host {
-    name: "bytes_host_test_tests_test_buf",
-    defaults: ["bytes_test_defaults_bytes"],
-    srcs: ["tests/test_buf.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
 rust_test {
-    name: "bytes_device_test_tests_test_buf",
-    defaults: ["bytes_test_defaults_bytes"],
+    name: "bytes_test_tests_test_buf",
+    defaults: ["bytes_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_buf.rs"],
-}
-
-rust_test_host {
-    name: "bytes_host_test_tests_test_buf_mut",
-    defaults: ["bytes_test_defaults_bytes"],
-    srcs: ["tests/test_buf_mut.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "bytes_device_test_tests_test_buf_mut",
-    defaults: ["bytes_test_defaults_bytes"],
+    name: "bytes_test_tests_test_buf_mut",
+    defaults: ["bytes_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_buf_mut.rs"],
-}
-
-rust_test_host {
-    name: "bytes_host_test_tests_test_bytes",
-    defaults: ["bytes_test_defaults_bytes"],
-    srcs: ["tests/test_bytes.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "bytes_device_test_tests_test_bytes",
-    defaults: ["bytes_test_defaults_bytes"],
+    name: "bytes_test_tests_test_bytes",
+    defaults: ["bytes_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_bytes.rs"],
-}
-
-rust_test_host {
-    name: "bytes_host_test_tests_test_bytes_odd_alloc",
-    defaults: ["bytes_test_defaults_bytes"],
-    srcs: ["tests/test_bytes_odd_alloc.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "bytes_device_test_tests_test_bytes_odd_alloc",
-    defaults: ["bytes_test_defaults_bytes"],
+    name: "bytes_test_tests_test_bytes_odd_alloc",
+    defaults: ["bytes_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_bytes_odd_alloc.rs"],
-}
-
-rust_test_host {
-    name: "bytes_host_test_tests_test_bytes_vec_alloc",
-    defaults: ["bytes_test_defaults_bytes"],
-    srcs: ["tests/test_bytes_vec_alloc.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "bytes_device_test_tests_test_bytes_vec_alloc",
-    defaults: ["bytes_test_defaults_bytes"],
+    name: "bytes_test_tests_test_bytes_vec_alloc",
+    defaults: ["bytes_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_bytes_vec_alloc.rs"],
-}
-
-rust_test_host {
-    name: "bytes_host_test_tests_test_chain",
-    defaults: ["bytes_test_defaults_bytes"],
-    srcs: ["tests/test_chain.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "bytes_device_test_tests_test_chain",
-    defaults: ["bytes_test_defaults_bytes"],
+    name: "bytes_test_tests_test_chain",
+    defaults: ["bytes_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_chain.rs"],
-}
-
-rust_test_host {
-    name: "bytes_host_test_tests_test_debug",
-    defaults: ["bytes_test_defaults_bytes"],
-    srcs: ["tests/test_debug.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "bytes_device_test_tests_test_debug",
-    defaults: ["bytes_test_defaults_bytes"],
+    name: "bytes_test_tests_test_debug",
+    defaults: ["bytes_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_debug.rs"],
-}
-
-rust_test_host {
-    name: "bytes_host_test_tests_test_iter",
-    defaults: ["bytes_test_defaults_bytes"],
-    srcs: ["tests/test_iter.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "bytes_device_test_tests_test_iter",
-    defaults: ["bytes_test_defaults_bytes"],
+    name: "bytes_test_tests_test_iter",
+    defaults: ["bytes_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_iter.rs"],
-}
-
-rust_test_host {
-    name: "bytes_host_test_tests_test_reader",
-    defaults: ["bytes_test_defaults_bytes"],
-    srcs: ["tests/test_reader.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "bytes_device_test_tests_test_reader",
-    defaults: ["bytes_test_defaults_bytes"],
+    name: "bytes_test_tests_test_reader",
+    defaults: ["bytes_test_defaults"],
+    host_supported: true,
     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_bytes"],
+    name: "bytes_test_tests_test_take",
+    defaults: ["bytes_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_take.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
-rust_test {
-    name: "bytes_device_test_tests_test_take",
-    defaults: ["bytes_test_defaults_bytes"],
-    srcs: ["tests/test_take.rs"],
-}
-
 rust_library {
     name: "libbytes",
     host_supported: true,
-- 
cgit v1.2.3


From 37730ba6486519b3cdcc95d33001627e5e796a00 Mon Sep 17 00:00:00 2001
From: Roopa Sattiraju <sattiraju@google.com>
Date: Tue, 21 Dec 2021 15:49:53 -0800
Subject: Adding bluetooth apex

Bug: 206121418
Test: Compile
Change-Id: I54dc21712c4c79b978fe36a05e0e3e9c7c284c63
---
 Android.bp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Android.bp')

diff --git a/Android.bp b/Android.bp
index 2b73884..5853d9d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -150,6 +150,7 @@ rust_library {
     ],
     apex_available: [
         "//apex_available:platform",
+        "com.android.bluetooth",
         "com.android.compos",
         "com.android.resolv",
         "com.android.uwb",
-- 
cgit v1.2.3


From 3347351bae57dd29decb020c82bd4466b3949a4a Mon Sep 17 00:00:00 2001
From: Matthew Maurer <mmaurer@google.com>
Date: Thu, 13 Jan 2022 21:45:49 +0000
Subject: Make vendor available

Bug: 216358770
Change-Id: Idda7787a87f26521e6973e7d04bd6371ae64077d
---
 Android.bp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Android.bp')

diff --git a/Android.bp b/Android.bp
index 5853d9d..97dc970 100644
--- a/Android.bp
+++ b/Android.bp
@@ -156,5 +156,6 @@ rust_library {
         "com.android.uwb",
         "com.android.virt",
     ],
+    vendor_available: true,
     min_sdk_version: "29",
 }
-- 
cgit v1.2.3