1 files changed, 22 insertions, 27 deletions
diff --git a/Android.bp b/Android.bp
index 06af1ed..63ead71 100644
--- a/Android.bp
+++ b/Android.bp
@@ -23,9 +23,14 @@ rust_library {
     host_supported: true,
     crate_name: "zerocopy",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.6.1",
+    cargo_pkg_version: "0.7.5",
     srcs: ["src/lib.rs"],
-    edition: "2018",
+    edition: "2021",
+    features: [
+        "byteorder",
+        "derive",
+        "zerocopy-derive",
+    ],
     rustlibs: [
         "libbyteorder",
     ],
@@ -42,10 +47,15 @@ rust_library_rlib {
     name: "libzerocopy_nostd",
     crate_name: "zerocopy",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.6.1",
+    cargo_pkg_version: "0.7.5",
     srcs: ["src/lib.rs"],
-    edition: "2018",
-    features: ["alloc"],
+    edition: "2021",
+    features: [
+        "alloc",
+        "byteorder",
+        "derive",
+        "zerocopy-derive",
+    ],
     rustlibs: [
         "libbyteorder_nostd",
     ],
@@ -69,9 +79,14 @@ rust_library_rlib {
     name: "libzerocopy_nostd_noalloc",
     crate_name: "zerocopy",
     cargo_env_compat: true,
-    cargo_pkg_version: "0.6.1",
+    cargo_pkg_version: "0.7.5",
     srcs: ["src/lib.rs"],
-    edition: "2018",
+    edition: "2021",
+    features: [
+        "byteorder",
+        "derive",
+        "zerocopy-derive",
+    ],
     rustlibs: [
         "libbyteorder_nostd",
     ],
@@ -89,23 +104,3 @@ rust_library_rlib {
     product_available: true,
     vendor_available: true,
 }
-
-rust_test {
-    name: "zerocopy_test_src_lib",
-    host_supported: true,
-    crate_name: "zerocopy",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.6.1",
-    srcs: ["src/lib.rs"],
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    test_options: {
-        unit_test: true,
-    },
-    edition: "2018",
-    rustlibs: [
-        "libbyteorder",
-        "librand",
-    ],
-    proc_macros: ["libzerocopy_derive"],
-}