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

Commit 13c75d9d authored by Zach Johnson's avatar Zach Johnson Committed by Automerger Merge Worker
Browse files

Merge "add rust defaults and turn off targets on mac" am: ee5a9f98 am: c1cc57a5 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1526641

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a84b2fcf65231829e25711f75d586fc9582e034
parents d4bd4167 c1cc57a5

system/gd/rust/common/Android.bp

+1 −1
Original line number Diff line number Diff line 
rust_library {

    name: "libbt_common",

    defaults: ["gd_rust_defaults"],

    crate_name: "bt_common",

    srcs: ["src/lib.rs"],

    edition: "2018",
@@ -25,7 +26,6 @@ rust_library { 
    proc_macros: [

        "libpaste",

    ],

    host_supported: true,

}



rust_test_host {

system/gd/rust/facade/Android.bp

+2 −2
Original line number Diff line number Diff line 
rust_library {

    name: "libbluetooth_with_facades",

    defaults: ["gd_rust_defaults"],

    crate_name: "bluetooth_with_facades",

    srcs: ["src/lib.rs"],

    edition: "2018",
@@ -15,11 +16,11 @@ rust_library { 
      "libgddi",

      "libbt_main",

    ],

    host_supported: true,

}



rust_binary {

    name: "bluetooth_with_facades",

    defaults: ["gd_rust_defaults"],

    srcs: ["src/main.rs"],

    edition: "2018",

    rustlibs: [
@@ -32,5 +33,4 @@ rust_binary { 
      "libbt_common",

      "liblog_rust",

    ],

    host_supported: true,

}

system/gd/rust/gddi/Android.bp

+1 −1
Original line number Diff line number Diff line 
rust_library {

    name: "libgddi",

    defaults: ["gd_rust_defaults"],

    crate_name: "gddi",

    srcs: ["src/lib.rs"],

    host_supported: true,

    edition: "2018",

    proc_macros: ["libgddi_macros"],

    rustlibs: ["libtokio"],

system/gd/rust/hal/Android.bp

+2 −1
Original line number Diff line number Diff line 
rust_library {

    name: "libbt_hal",

    defaults: ["gd_rust_defaults"],

    crate_name: "bt_hal",

    srcs: ["src/lib.rs"],

    edition: "2018",
@@ -19,7 +20,6 @@ rust_library { 
        "liblog_rust",

        "libbt_common",

    ],

    host_supported: true,

    target: {

        android: {

            static_libs: ["libbt_hidl_hal_cxx"],
@@ -50,6 +50,7 @@ genrule { 


cc_library_static {

    name: "libbt_hidl_hal_cxx",

    defaults: ["gd_ffi_defaults"],

    srcs: ["src/hidl/interop.cc"],

    local_include_dirs: ["src/hidl"],

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

system/gd/rust/hci/Android.bp

+1 −1
Original line number Diff line number Diff line 
rust_library {

    name: "libbt_hci",

    defaults: ["gd_rust_defaults"],

    crate_name: "bt_hci",

    srcs: ["src/lib.rs"],

    edition: "2018",
@@ -21,5 +22,4 @@ rust_library { 
    proc_macros: [

        "libnum_derive",

    ],

    host_supported: true,

}