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

Commit 9b26ab52 authored by Ivan Lozano's avatar Ivan Lozano Committed by Automerger Merge Worker
Browse files

Merge "Remove unnecessary rust_ffi entries" into main am: d2f496c0 am: 3b805478 

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



Change-Id: Ic24a07fb364c2b6d236c7085cf4c68cea5b8e7c7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1871b3ed 3b805478

system/gd/rust/topshim/facade/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ rust_defaults { 
        "libbluetooth-dumpsys",

        "libbluetooth-gdx",

        "libbluetooth-types",

        "libbluetooth_core_rs",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd", // Gabeldorsche

        "libbluetooth_log",

system/rust/Android.bp

+1 −6
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ rust_defaults { 
    ],

    static_libs: [

        "libbt_shim_bridge",

        "libbt_shim_ffi",



        "libchrome",

        "libevent",

        "libmodpb64",
@@ -37,13 +35,10 @@ rust_defaults { 
        "libanyhow",

        "libbitflags",

        "libbt_common",

        "libbt_shim",

        "libcxx",

        "liblog_rust",

        "libscopeguard",



        // needed to work around duplicate symbols

        // caused by bug in Soong

        "libbt_shim",

    ],

    whole_static_libs: [

        "libbluetooth_core_rs_bridge",