Generate cxx binding in build.rs

native/src/boot/Cargo.toml

@@ -9,6 +9,7 @@ path = "lib.rs"
 
 [build-dependencies]
 protobuf-codegen = "3.2.0"
+cxx-gen = { path = "../external/cxx-rs/gen/lib" }
 
 [dependencies]
 base = { path = "../base" }

native/src/boot/build.rs

@@ -1,5 +1,10 @@
 use protobuf_codegen::Customize;
 
+use crate::gen::gen_cxx_binding;
+
+#[path = "../base/gen.rs"]
+mod gen;
+
 fn main() {
     println!("cargo:rerun-if-changed=update_metadata.proto");
     protobuf_codegen::Codegen::new()
@@ -9,4 +14,6 @@ fn main() {
         .customize(Customize::default().gen_mod_rs(false))
         .out_dir(".")
         .run_from_script();
+
+    gen_cxx_binding("boot-rs");
 }

native/src/boot/lib.rs

@@ -9,6 +9,7 @@ mod update_metadata;
 #[cxx::bridge(namespace = "rust")]
 pub mod ffi {
     extern "C++" {
+        include!("compress.hpp");
         pub unsafe fn decompress(in_: *const u8, in_size: u64, fd: i32) -> bool;
     }
 

native/src/boot/magiskboot.hpp

@@ -2,6 +2,8 @@
 
 #include <sys/types.h>
 
+#include "boot-rs.hpp"
+
 #define HEADER_FILE     "header"
 #define KERNEL_FILE     "kernel"
 #define RAMDISK_FILE    "ramdisk.cpio"

native/src/boot/main.cpp

@@ -4,8 +4,6 @@
 #include "magiskboot.hpp"
 #include "compress.hpp"
 
-#include "boot-rs.cpp"
-
 using namespace std;
 
 static void print_formats() {