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

Commit 793e64bf authored by Allen Webb's avatar Allen Webb Committed by Automerger Merge Worker
Browse files

Merge "floss: use pkg-config for linking protobuf and flatbuffers" into main... 

Merge "floss: use pkg-config for linking protobuf and flatbuffers" into main am: 12e4368b am: 7f49d1a5 am: 78cfe699

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



Change-Id: Idf8574080c0b61badb279bf5a2360d0bf70d38d6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a046ad89 78cfe699

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

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ fn main() { 
    println!("cargo:rerun-if-changed={}", cxx_outdir.into_string().unwrap());



    // A few dynamic links

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

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

    Config::new().probe("flatbuffers").unwrap();

    Config::new().probe("protobuf").unwrap();

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



    // Clang requires -lc++ instead of -lstdc++