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

Commit 91e53d2e authored by Hansong Zhang's avatar Hansong Zhang
Browse files

Fix include paths in topshim bindings 

To be consistent with Android build; also rename to hpp since otherwise
Android won't use c++ libraries.

Test: build in chromeos
Bug: 181590011
Tag: #refactor
Change-Id: Ica4afb7ad9ce2cb5bbd14aae467366a028192494
parent b5c40271

system/gd/rust/topshim/bindings/wrapper.h→system/gd/rust/topshim/bindings/wrapper.hpp

+10 −0
Original line number Diff line number Diff line 
#pragma once



// Base

#include "btcore/include/hal_util.h"

#include "include/hardware/bluetooth.h"

#include "hardware/bluetooth.h"

#include "include/hal_util.h"



// Profiles



// Hid host profile

#include "include/hardware/bt_hh.h"
 
#include "hardware/bt_hh.h"

system/gd/rust/topshim/build.rs

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ fn main() { 
        .collect::<Vec<String>>();



    let search_root = env::var("CXX_ROOT_PATH").unwrap();

    let paths = vec!["/", "/include", "/include/hardware", "/types"];

    let paths = vec!["/", "/btcore", "/include", "/include/hardware", "/types"];



    let bt_searches =

        paths.iter().map(|tail| format!("-I{}{}", search_root, tail)).collect::<Vec<String>>();
@@ -46,7 +46,7 @@ fn main() { 
        .derive_partialeq(true)

        .derive_eq(true)

        .derive_default(true)

        .header("bindings/wrapper.h")

        .header("bindings/wrapper.hpp")

        .generate()

        .expect("Unable to generate bindings");