[avb] Rename the avb nostd crate name as avb
This allows us to have an avb std crate later with the same crate
name.
Test: atest MicrodroidHostTests
Bug: 260563104
Change-Id: Ia6bddf7f47fb586d90f10f653797704090ac6a4b
diff --git a/libs/avb/Android.bp b/libs/avb/Android.bp
index 28e969d..a19a538 100644
--- a/libs/avb/Android.bp
+++ b/libs/avb/Android.bp
@@ -39,7 +39,7 @@
rust_library_rlib {
name: "libavb_nostd",
- crate_name: "avb_nostd",
+ crate_name: "avb",
srcs: ["src/lib.rs"],
no_stdlibs: true,
prefer_rlib: true,
diff --git a/pvmfw/src/main.rs b/pvmfw/src/main.rs
index 7222a0d..1767e24 100644
--- a/pvmfw/src/main.rs
+++ b/pvmfw/src/main.rs
@@ -32,9 +32,8 @@
mod pci;
mod smccc;
-use crate::{entry::RebootReason, memory::MemoryTracker, pci::PciInfo};
-use avb::PUBLIC_KEY;
-use avb_nostd::verify_image;
+use crate::{avb::PUBLIC_KEY, entry::RebootReason, memory::MemoryTracker, pci::PciInfo};
+use ::avb::verify_image;
use dice::bcc;
use libfdt::Fdt;
use log::{debug, error, info, trace};