Make cxx binding generate less code

native/src/base/Android.mk

@@ -7,7 +7,6 @@ LOCAL_MODULE := libbase
 LOCAL_C_INCLUDES := \
     src/include \
     $(LOCAL_PATH)/include \
-    src/external/cxx-rs/include \
     out/generated
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
 LOCAL_EXPORT_STATIC_LIBRARIES := libcxx

native/src/base/include/rust/cxx.h

@@ -0,0 +1 @@
+../../../external/cxx-rs/include/cxx.h

native/src/base/misc.hpp

@@ -5,7 +5,7 @@
 #include <functional>
 #include <string_view>
 #include <bitset>
-#include <cxx.h>
+#include <rust/cxx.h>
 
 #include "xwrap.hpp"
 

native/src/boot/bootimg.hpp

@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <utility>
 #include <bitset>
-#include <cxx.h>
+#include <rust/cxx.h>
 
 /******************
  * Special Headers

native/src/core/include/sqlite.hpp

@@ -2,7 +2,7 @@
 
 #include <functional>
 
-#include <cxx.h>
+#include <rust/cxx.h>
 
 #define SQLITE_OPEN_READWRITE        0x00000002  /* Ok for sqlite3_open_v2() */
 #define SQLITE_OPEN_CREATE           0x00000004  /* Ok for sqlite3_open_v2() */

native/src/include/codegen.rs

@@ -6,7 +6,7 @@ use std::io::Write;
 use std::path::Path;
 use std::{fs, io, process};
 
-use cxx_gen::Opt;
+use cxx_gen::{Include, IncludeKind, Opt};
 
 trait ResultExt<T> {
     fn ok_or_exit(self) -> T;
@@ -38,7 +38,12 @@ fn write_if_diff<P: AsRef<Path>>(path: P, bytes: &[u8]) -> io::Result<()> {
 
 pub fn gen_cxx_binding(name: &str) {
     println!("cargo:rerun-if-changed=lib.rs");
-    let opt = Opt::default();
+    let mut opt = Opt::default();
+    opt.cxx_impl_annotations = Some("[[gnu::always_inline]]".to_string());
+    opt.include.push(Include {
+        path: "rust/cxx.h".to_string(),
+        kind: IncludeKind::Bracketed,
+    });
     let code = cxx_gen::generate_header_and_cc_with_path("lib.rs", &opt);
     write_if_diff(format!("{name}.cpp"), code.implementation.as_slice()).ok_or_exit();
     write_if_diff(format!("{name}.hpp"), code.header.as_slice()).ok_or_exit();

native/src/sepolicy/policy.hpp

@@ -4,7 +4,7 @@
 
 #include <map>
 #include <string_view>
-#include <cxx.h>
+#include <rust/cxx.h>
 
 #include <sepol/policydb/policydb.h>