diff --git a/native/src/base/lib.rs b/native/src/base/lib.rs index e9817bd34..44189dc87 100644 --- a/native/src/base/lib.rs +++ b/native/src/base/lib.rs @@ -10,7 +10,7 @@ pub use cstr::{ }; use cxx_extern::*; pub use dir::*; -pub use ffi::fork_dont_care; +pub use ffi::{Utf8CStrRef, fork_dont_care}; pub use files::*; pub use logging::*; pub use misc::*; @@ -27,7 +27,7 @@ mod result; mod xwrap; #[cxx::bridge] -pub mod ffi { +mod ffi { #[derive(Copy, Clone)] #[repr(i32)] #[cxx_name = "LogLevel"] diff --git a/native/src/boot/lib.rs b/native/src/boot/lib.rs index 92d0f222f..12616b2a9 100644 --- a/native/src/boot/lib.rs +++ b/native/src/boot/lib.rs @@ -52,7 +52,7 @@ pub mod ffi { include!("magiskboot.hpp"); #[cxx_name = "Utf8CStr"] - type Utf8CStrRef<'a> = base::ffi::Utf8CStrRef<'a>; + type Utf8CStrRef<'a> = base::Utf8CStrRef<'a>; fn cleanup(); fn unpack(image: Utf8CStrRef, skip_decomp: bool, hdr: bool) -> i32; diff --git a/native/src/core/lib.rs b/native/src/core/lib.rs index aa2e53bdf..eaf63faeb 100644 --- a/native/src/core/lib.rs +++ b/native/src/core/lib.rs @@ -127,7 +127,7 @@ pub mod ffi { unsafe extern "C++" { #[cxx_name = "Utf8CStr"] - type Utf8CStrRef<'a> = base::ffi::Utf8CStrRef<'a>; + type Utf8CStrRef<'a> = base::Utf8CStrRef<'a>; #[cxx_name = "ucred"] type UCred = crate::UCred; diff --git a/native/src/init/lib.rs b/native/src/init/lib.rs index 649a8b465..3613b921e 100644 --- a/native/src/init/lib.rs +++ b/native/src/init/lib.rs @@ -50,7 +50,7 @@ pub mod ffi { include!("init.hpp"); #[cxx_name = "Utf8CStr"] - type Utf8CStrRef<'a> = base::ffi::Utf8CStrRef<'a>; + type Utf8CStrRef<'a> = base::Utf8CStrRef<'a>; unsafe fn magisk_proxy_main(argc: i32, argv: *mut *mut c_char) -> i32; fn backup_init() -> Utf8CStrRef<'static>; diff --git a/native/src/sepolicy/lib.rs b/native/src/sepolicy/lib.rs index 5597155e4..f44bd2a6c 100644 --- a/native/src/sepolicy/lib.rs +++ b/native/src/sepolicy/lib.rs @@ -31,7 +31,7 @@ pub mod ffi { include!("../base/include/base.hpp"); #[cxx_name = "Utf8CStr"] - type Utf8CStrRef<'a> = base::ffi::Utf8CStrRef<'a>; + type Utf8CStrRef<'a> = base::Utf8CStrRef<'a>; type sepol_impl;