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

Commit c687f792 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I98a14186,Ic24f383a 

* changes:
  topshim: Add controller shim
  topshim/facade: Don't link with libbluetooth twice
parents b087eae2 913a01c0

system/btcore/Android.bp

+13 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ package { 
    default_applicable_licenses: ["system_bt_license"],

}



cc_library_static {

    name: "libbtcore",

cc_defaults {

    name: "libbtcore_defaults",

    defaults: ["fluoride_defaults"],

    local_include_dirs: ["include"],

    include_dirs: [
@@ -35,6 +35,17 @@ cc_library_static { 
    },

}



cc_library_static {

    name: "libbtcore",

    defaults: ["libbtcore_defaults"],

}



cc_library_static {

    name: "libbtcore-static",

    defaults: ["libbtcore_defaults"],

    cflags: ["-DSTATIC_LIBBLUETOOTH"],

}



cc_library_headers {

    name: "libbtcore_headers",

    defaults: ["libchrome_support_defaults"],

system/btif/Android.bp

+13 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ genrule { 
}



// libbtif static library for target

cc_library_static {

    name: "libbtif",

cc_defaults {

    name: "libbtif_defaults",

    defaults: ["fluoride_defaults"],

    include_dirs: btifCommonIncludes,

    srcs: [
@@ -195,6 +195,17 @@ cc_library_static { 
    host_supported: true,

}



cc_library_static {

    name: "libbtif",

    defaults: ["libbtif_defaults"],

}



cc_library_static {

    name: "libbtif-static",

    defaults: ["libbtif_defaults"],

    cflags: ["-DSTATIC_LIBBLUETOOTH"],

}



// btif unit tests for target

cc_test {

    name: "net_test_btif",

system/gd/rust/shim/Android.bp

+20 −3
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ cc_defaults { 
    },

}



rust_ffi_static {

    name: "libbt_shim_ffi",

rust_defaults {

    name: "libbt_shim_defaults",

    defaults: ["gd_rust_defaults"],

    crate_name: "bt_shim",

    srcs: ["src/lib.rs"],
@@ -51,8 +51,18 @@ rust_ffi_static { 
    ],

}



rust_library_rlib {

    name: "libbt_shim",

    defaults: ["libbt_shim_defaults"],

}



rust_ffi_static {

    name: "libbt_shim_ffi",

    defaults: ["libbt_shim_defaults"],

}



cc_library_static {

    name: "libbluetooth_rust_interop",

    name: "libbt_shim_bridge",

    defaults: ["gd_ffi_defaults"],

    generated_headers: [

        "libbt_init_flags_bridge_header",
@@ -87,9 +97,16 @@ cc_library_static { 
    shared_libs: [

        "libchrome",

    ],

}



cc_library_static {

    name: "libbluetooth_rust_interop",

    defaults: ["gd_ffi_defaults"],

    whole_static_libs: [

        "libbt_shim_bridge",

        "libbt_shim_ffi",

    ],

    host_supported: true,

}



cc_library_static {

system/gd/rust/topshim/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ cc_library_static { 
        "btif/btif_shim.cc",

        "gatt/gatt_shim.cc",

        "hfp/hfp_shim.cc",

        "controller/controller_shim.cc",

    ],

    generated_headers: ["libbt_topshim_bridge_header", "cxx-bridge-header"],

    generated_sources: ["libbt_topshim_bridge_code"],
@@ -76,6 +77,7 @@ gensrcs { 
        "src/profiles/avrcp.rs",

        "src/profiles/hfp.rs",

        "src/profiles/gatt.rs",

        "src/controller.rs",

    ],

    output_extension: "rs.h",

    export_include_dirs: ["."],
@@ -91,6 +93,7 @@ gensrcs { 
        "src/profiles/avrcp.rs",

        "src/profiles/hfp.rs",

        "src/profiles/gatt.rs",

        "src/controller.rs",

    ],

    output_extension: "cc",

    export_include_dirs: ["."],

system/gd/rust/topshim/BUILD.gn

+5 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ cxxbridge_header("btif_bridge_header") { 
    "src/profiles/avrcp.rs",

    "src/profiles/hfp.rs",

    "src/profiles/gatt.rs",

    "src/controller.rs",

  ]

  all_dependent_configs = [ ":rust_topshim_config" ]

  deps = [":cxxlibheader"]
@@ -41,8 +42,9 @@ cxxbridge_cc("btif_bridge_code") { 
    "src/profiles/avrcp.rs",

    "src/profiles/hfp.rs",

    "src/profiles/gatt.rs",

    "src/controller.rs",

  ]

  deps = [":btif_bridge_header"]

  deps = [":btif_bridge_header", "//bt/gd:BluetoothGeneratedPackets_h"]

  configs = [ "//bt/gd:gd_defaults" ]

}
@@ -53,9 +55,10 @@ source_set("btif_cxx_bridge_code") { 
    "btav_sink/btav_sink_shim.cc",

    "hfp/hfp_shim.cc",

    "gatt/gatt_shim.cc",

    "controller/controller_shim.cc",

  ]



  deps = [":btif_bridge_header"]

  deps = [":btif_bridge_header", "//bt/gd:BluetoothGeneratedPackets_h"]

  configs += ["//bt/gd:gd_defaults"]

}