commit d69345d83853a2352e3b0b622e70a82c78996752
author Steven Moreland <smoreland@google.com> Mon Feb 06 21:26:14 2023 +0000
committer Steven Moreland <smoreland@google.com> Mon Feb 06 23:03:36 2023 +0000
tree c584275b24a844fa975f19062372a8b3bf8f5757
parent 59e5cd8d43221967190084606209891052769554

use libzerocopy_nostd

Following usual pattern, since we need
a 'normal' libzerocopy now.

Bug: 268087877
Bug: 268061413
Test: crosvm tests
Change-Id: Id2ae5f0e041eab39907ac78c9f4c013f2d08119c

Android.bp

diff --git a/Android.bp b/Android.bp
index d2c0f79..b8ee9ba 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,7 +22,6 @@
 
 rust_library {
     name: "libvirtio_drivers",
-    // has rustc warnings
     crate_name: "virtio_drivers",
     cargo_env_compat: true,
     cargo_pkg_version: "0.3.0",
@@ -32,7 +31,7 @@
     rustlibs: [
         "libbitflags",
         "liblog_rust_nostd",
-        "libzerocopy",
+        "libzerocopy_nostd",
     ],
     apex_available: [
         "//apex_available:platform",
@@ -42,7 +41,6 @@
 
 rust_test {
     name: "virtio-drivers_test_src_lib",
-    // has rustc warnings
     crate_name: "virtio_drivers",
     cargo_env_compat: true,
     cargo_pkg_version: "0.3.0",

patches/Android.bp.patch

diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index 54cf1b4..cd5208e 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -10,7 +10,8 @@
      rustlibs: [
          "libbitflags",
 -        "liblog_rust",
+-        "libzerocopy",
 +        "liblog_rust_nostd",
-         "libzerocopy",
++        "libzerocopy_nostd",
      ],
      apex_available: [