1 files changed, 10 insertions, 25 deletions
diff --git a/Android.bp b/Android.bp
index e43b8b2..a5868e9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,22 +44,19 @@ rust_test {
     host_supported: true,
     crate_name: "fifo",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.8.3",
+    cargo_pkg_version: "0.8.5",
     srcs: ["tests/fifo.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
-    edition: "2018",
+    edition: "2021",
     features: [
-        "crossbeam-epoch",
-        "crossbeam-utils",
         "default",
         "std",
     ],
     rustlibs: [
-        "libcfg_if",
         "libcrossbeam_deque",
         "libcrossbeam_epoch",
         "libcrossbeam_utils",
@@ -72,22 +69,19 @@ rust_test {
     host_supported: true,
     crate_name: "injector",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.8.3",
+    cargo_pkg_version: "0.8.5",
     srcs: ["tests/injector.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
-    edition: "2018",
+    edition: "2021",
     features: [
-        "crossbeam-epoch",
-        "crossbeam-utils",
         "default",
         "std",
     ],
     rustlibs: [
-        "libcfg_if",
         "libcrossbeam_deque",
         "libcrossbeam_epoch",
         "libcrossbeam_utils",
@@ -100,22 +94,19 @@ rust_test {
     host_supported: true,
     crate_name: "lifo",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.8.3",
+    cargo_pkg_version: "0.8.5",
     srcs: ["tests/lifo.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
-    edition: "2018",
+    edition: "2021",
     features: [
-        "crossbeam-epoch",
-        "crossbeam-utils",
         "default",
         "std",
     ],
     rustlibs: [
-        "libcfg_if",
         "libcrossbeam_deque",
         "libcrossbeam_epoch",
         "libcrossbeam_utils",
@@ -128,22 +119,19 @@ rust_test {
     host_supported: true,
     crate_name: "steal",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.8.3",
+    cargo_pkg_version: "0.8.5",
     srcs: ["tests/steal.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
-    edition: "2018",
+    edition: "2021",
     features: [
-        "crossbeam-epoch",
-        "crossbeam-utils",
         "default",
         "std",
     ],
     rustlibs: [
-        "libcfg_if",
         "libcrossbeam_deque",
         "libcrossbeam_epoch",
         "libcrossbeam_utils",
@@ -156,17 +144,14 @@ rust_library {
     host_supported: true,
     crate_name: "crossbeam_deque",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.8.3",
+    cargo_pkg_version: "0.8.5",
     srcs: ["src/lib.rs"],
-    edition: "2018",
+    edition: "2021",
     features: [
-        "crossbeam-epoch",
-        "crossbeam-utils",
         "default",
         "std",
     ],
     rustlibs: [
-        "libcfg_if",
         "libcrossbeam_epoch",
         "libcrossbeam_utils",
     ],