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

Commit 8fe8f1af authored by David Duarte's avatar David Duarte
Browse files

Remove libbt_shim_bridge from fluoride_defaults 

Bug: 279502784
Test: mmm packages/modules/Bluetooth
Change-Id: I3a270e9b05a0b5f8d2cc13e878c3d2f7c4e6d10c
parent bc88b0f4

android/app/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ cc_library_shared { 
        "libbt-sbc-encoder",

        "libbt-stack",

        "libbt-stack-core",

        "libbt_shim_bridge",

        "libbtcore",

        "libbtdevice",

        "libbte",

system/audio_hal_interface/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ cc_library_static { 
    ],

    static_libs: [

        "libbt-common",

        "libbt_shim_bridge",

        "libosi",

    ],

    target: {
@@ -100,6 +101,7 @@ cc_test { 
    static_libs: [

        "libbt-audio-hal-interface",

        "libbt-common",

        "libbt_shim_bridge",

        "libchrome",

    ],

    cflags: [

system/bta/Android.bp

+16 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ cc_library_static { 
        "libbluetooth_gd",

        "libbt-bta-core",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libcom.android.sysprop.bluetooth",

    ],

    shared_libs: [
@@ -192,6 +193,7 @@ cc_library_static { 
    static_libs: [

        "lib-bt-packets",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libcom.android.sysprop.bluetooth",

    ],

    apex_available: [
@@ -247,6 +249,7 @@ cc_test { 
        "libbt-bta-core",

        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libbtcore",

        "libchrome",

        "libcom.android.sysprop.bluetooth",
@@ -294,6 +297,7 @@ cc_test { 
        "libbt-bta-core",

        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libbtcore",

        "libchrome",

        "libosi",
@@ -411,6 +415,7 @@ cc_test { 
        "libbluetooth_gd",

        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libbtcore",

        "libbtdevice",

        "libchrome",
@@ -473,6 +478,7 @@ cc_test { 
        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",

        "libchrome",

        "libgmock",

        "libosi",
@@ -518,6 +524,7 @@ cc_test { 
        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",

        "libchrome",

        "libgmock",

        "libosi",
@@ -575,6 +582,7 @@ cc_test { 
        "libbluetooth_gd",

        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libchrome",

        "libgmock",

        "libosi",
@@ -719,6 +727,7 @@ cc_test { 
        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",

        "libchrome",

        "libevent",

        "libflatbuffers-cpp",
@@ -814,6 +823,7 @@ cc_test { 
        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",

        "libchrome",

        "libevent",

        "libflatbuffers-cpp",
@@ -890,6 +900,7 @@ cc_test { 
        "libbt-audio-hal-interface",

        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libchrome",

        "libevent",

        "libflatbuffers-cpp",
@@ -953,6 +964,7 @@ cc_test { 
        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",

        "libchrome",

        "libgmock",

        "libosi",
@@ -1008,6 +1020,7 @@ cc_test { 
        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",

        "libchrome",

        "libgmock",

    ],
@@ -1072,6 +1085,7 @@ cc_test { 
        "libbluetooth-types",

        "libbt-audio-hal-interface",

        "libbt-common",

        "libbt_shim_bridge",

        "libchrome",

        "libevent",

        "libgmock",
@@ -1133,6 +1147,7 @@ cc_test { 
        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",

        "libchrome",

        "libgmock",

    ],
@@ -1197,6 +1212,7 @@ cc_test { 
        "libbluetooth_gd",

        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libchrome",

        "libcom.android.sysprop.bluetooth",

        "libevent",

system/btcore/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ cc_library_static { 
            cflags: ["-D_GNU_SOURCE"],

        },

    },

    static_libs: ["libbt_shim_bridge"],

}



cc_library_static {
@@ -65,6 +66,7 @@ cc_library_static { 
    ],

    defaults: ["libbtcore_defaults"],

    min_sdk_version: "Tiramisu",

    static_libs: ["libbt_shim_bridge"],

}



cc_library_headers {

system/btif/Android.bp

+10 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ cc_library_static { 
        "libbt-platform-protos-lite",

        "libbt-stack",

        "libbt-stack-core",

        "libbt_shim_bridge",

        "libbtif-core",

    ],

    shared_libs: [
@@ -230,6 +231,7 @@ cc_library_static { 
        "libbt-audio-hal-interface",

        "libbt-platform-protos-lite",

        "libbt-stack-core",

        "libbt_shim_bridge",

        "libstatslog_bt",

    ],

    shared_libs: [
@@ -297,6 +299,7 @@ cc_test { 
        "libbt-sbc-encoder",

        "libbt-stack",

        "libbt-stack-core",

        "libbt_shim_bridge",

        "libbtcore",

        "libbtdevice",

        "libbtif",
@@ -350,6 +353,7 @@ cc_test { 
    static_libs: [

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbt_shim_bridge",

        "libchrome",

        "libosi",

    ],
@@ -382,6 +386,7 @@ cc_test { 
    ],

    static_libs: [

        "libbluetooth-types",

        "libbt_shim_bridge",

        "libchrome",

        "libosi",

    ],
@@ -421,6 +426,7 @@ cc_test { 
        "libbluetooth_gd",

        "libbt-common",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libchrome",

        "libevent",

    ],
@@ -464,6 +470,7 @@ cc_test { 
    ],

    static_libs: [

        "libbluetooth-types",

        "libbt_shim_bridge",

        "libc++fs",

        "libchrome",

        "libgmock",
@@ -500,6 +507,7 @@ cc_test { 
    ],

    static_libs: [

        "libbluetooth-types",

        "libbt_shim_bridge",

        "libchrome",

        "libcom.android.sysprop.bluetooth",

        "libosi",
@@ -607,6 +615,7 @@ cc_test { 
        "libbt-sbc-encoder",

        "libbt-stack",

        "libbt-stack-core",

        "libbt_shim_bridge",

        "libbtdevice",

        "libbtif",

        "libbtif-core",
@@ -740,6 +749,7 @@ cc_test { 
        "libbt-platform-protos-lite",

        "libbt-sbc-decoder",

        "libbt-sbc-encoder",

        "libbt_shim_bridge",

        "libbtdevice",

        "libbtif",

        "libbtif-core",