Merge "vmbase: Fully absorb libfdtpci as a crate module" into main
diff --git a/libs/fdtpci/Android.bp b/libs/fdtpci/Android.bp
deleted file mode 100644
index d7a5da3..0000000
--- a/libs/fdtpci/Android.bp
+++ /dev/null
@@ -1,19 +0,0 @@
-package {
- default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-rust_library_rlib {
- name: "libfdtpci",
- edition: "2021",
- no_stdlibs: true,
- host_supported: false,
- crate_name: "fdtpci",
- defaults: ["avf_build_flags_rust"],
- srcs: ["src/lib.rs"],
- rustlibs: [
- "liblibfdt_nostd",
- "liblog_rust_nostd",
- "libvirtio_drivers",
- ],
- apex_available: ["com.android.virt"],
-}
diff --git a/libs/fdtpci/TEST_MAPPING b/libs/fdtpci/TEST_MAPPING
deleted file mode 100644
index 192a7c6..0000000
--- a/libs/fdtpci/TEST_MAPPING
+++ /dev/null
@@ -1,9 +0,0 @@
-// When adding or removing tests here, don't forget to amend _all_modules list in
-// wireless/android/busytown/ath_config/configs/prod/avf/tests.gcl
-{
- "avf-presubmit": [
- {
- "name": "vmbase_example.integration_test"
- }
- ]
-}
diff --git a/libs/libvmbase/Android.bp b/libs/libvmbase/Android.bp
index e634c18..206c4cb 100644
--- a/libs/libvmbase/Android.bp
+++ b/libs/libvmbase/Android.bp
@@ -80,7 +80,6 @@
"libaarch64_paging",
"libbuddy_system_allocator",
"libcstr",
- "libfdtpci",
"liblibfdt_nostd",
"liblog_rust_nostd",
"libonce_cell_nostd",
diff --git a/libs/libvmbase/src/fdt.rs b/libs/libvmbase/src/fdt.rs
index 8618acd..ff0eaf0 100644
--- a/libs/libvmbase/src/fdt.rs
+++ b/libs/libvmbase/src/fdt.rs
@@ -14,6 +14,8 @@
//! High-level FDT functions.
+pub mod pci;
+
use core::ops::Range;
use cstr::cstr;
use libfdt::{self, Fdt, FdtError};
@@ -52,8 +54,3 @@
self.addr.map(|addr| addr..addr + self.size)
}
}
-
-/// Library for working with (VirtIO) PCI devices discovered from a device tree.
-pub mod pci {
- pub use fdtpci::*;
-}
diff --git a/libs/fdtpci/src/lib.rs b/libs/libvmbase/src/fdt/pci.rs
similarity index 99%
rename from libs/fdtpci/src/lib.rs
rename to libs/libvmbase/src/fdt/pci.rs
index bdd904f..ebaa671 100644
--- a/libs/fdtpci/src/lib.rs
+++ b/libs/libvmbase/src/fdt/pci.rs
@@ -14,8 +14,6 @@
//! Library for working with (VirtIO) PCI devices discovered from a device tree.
-#![no_std]
-
use core::{
ffi::CStr,
fmt::{self, Display, Formatter},