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

Commit 9b69cb38 authored by Ivan Lozano's avatar Ivan Lozano
Browse files

Remove unnecessary rust_ffi entries 

The build system no longer allows defining rust_ffi_rlibs in
static_libs for rust modules.

libbt_shim_ffi isn't needed as libbt_shim is already included in
rustlibs.

libbluetooth_core_rs is not needed as libbluetooth_core_rs_facade is
included in rustlibs.

Bug: 254469782
Test: m rust
Test: mma
Change-Id: I513b0446216c5417906b886d1ac8d7b8896cc235
parent a40afeca

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

+1 −2
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",
@@ -78,13 +77,13 @@ rust_defaults { 
        "libudrv-uipc",

    ],

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libcrypto",

        "libcutils",

        "libgrpc++",

        "libgrpc_wrap",

        "liblog",

        "server_configurable_flags",

        "libaconfig_storage_read_api_cc",

    ],

    proc_macros: [

        "libpaste",

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",