aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2023-02-07 02:40:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-07 02:40:42 +0000
commit0eb05a634ec46862b178b47e5e75948abfc3832d (patch)
treec584275b24a844fa975f19062372a8b3bf8f5757
parent21568f537336f721371f00541de50fa34def8a32 (diff)
parentd69345d83853a2352e3b0b622e70a82c78996752 (diff)
downloadvirtio-drivers-0eb05a634ec46862b178b47e5e75948abfc3832d.tar.gz
use libzerocopy_nostd am: d69345d838
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/virtio-drivers/+/2423894 Change-Id: I85ae3d3298256776d8ce6400e17c51f6b9ac71e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--patches/Android.bp.patch3
2 files changed, 3 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp
index d2c0f79..b8ee9ba 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,7 +22,6 @@ license {
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 @@ rust_library {
rustlibs: [
"libbitflags",
"liblog_rust_nostd",
- "libzerocopy",
+ "libzerocopy_nostd",
],
apex_available: [
"//apex_available:platform",
@@ -42,7 +41,6 @@ rust_library {
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",
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 @@ index b08769d..230c659 100644
rustlibs: [
"libbitflags",
- "liblog_rust",
+- "libzerocopy",
+ "liblog_rust_nostd",
- "libzerocopy",
++ "libzerocopy_nostd",
],
apex_available: [