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

Commit 4dd47c22 authored by Jeffrey Vander Stoep's avatar Jeffrey Vander Stoep Committed by Automerger Merge Worker
Browse files

Merge "Temporarily use libclap_deprecated" am: 1dcf47b1 am: 63ffb901 am:... 

Merge "Temporarily use libclap_deprecated" am: 1dcf47b1 am: 63ffb901 am: 72ad9de9 am: c5eb47ce am: 74ff5255

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



Change-Id: I6180e34c985f08eb2913c28b558b891cd29cbf89
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bf5d9eca 74ff5255

system/gd/rust/facade/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ rust_binary { 
    srcs: ["src/main.rs"],

    edition: "2018",

    rustlibs: [

      "libclap",

      "libclap_deprecated",

      "libbluetooth_with_facades",

      "libfutures",

      "libgrpcio",

system/gd/rust/topshim/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ rust_library_host_rlib { 
        "libbluetooth_rs",

        "libbt_common",

        "libbt_facade_helpers",

        "libclap",

        "libclap_deprecated",

        "libcxx",

        "libgrpcio",

        "libtokio",