Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22a4c07e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Floss: Check for C++ output dir instead of Rust output dir" am:... 

Merge "Floss: Check for C++ output dir instead of Rust output dir" am: c5b2dd89 am: e632ede7 am: 7f839f27 am: de917f23

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2124840



Change-Id: I576627ba4525e59222b12d5d7ccc8929272f3e41
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a79becbf de917f23

build.py

+1 −0
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ class HostBuild(): 
        self.env['RUSTFLAGS'] = self._generate_rustflags()

        self.env['CXX_ROOT_PATH'] = os.path.join(self.platform_dir, 'bt')

        self.env['CROS_SYSTEM_API_ROOT'] = os.path.join(self.platform_dir, 'system_api')

        self.env['CXX_OUTDIR'] = self._gn_default_output()



    def run_command(self, target, args, cwd=None, env=None):

        """ Run command and stream the output.

system/gd/rust/linux/service/build.rs

+2 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ use pkg_config::Config; 


fn main() {

    let target_dir = std::env::var_os("CARGO_TARGET_DIR").unwrap();

    let cxx_outdir = std::env::var_os("CXX_OUTDIR").unwrap();



    // The main linking point with c++ code is the libbluetooth-static.a

    // These includes all the symbols built via C++ but doesn't include other
@@ -9,7 +10,7 @@ fn main() { 
    println!("cargo:rustc-link-lib=static=bluetooth-static");

    println!("cargo:rustc-link-search=native={}", target_dir.clone().into_string().unwrap());

    // Also re-run the build if anything in the C++ build changes

    println!("cargo:rerun-if-changed={}", target_dir.into_string().unwrap());

    println!("cargo:rerun-if-changed={}", cxx_outdir.into_string().unwrap());



    // A few dynamic links

    println!("cargo:rustc-link-lib=dylib=flatbuffers");