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

Commit 0a05b0f4 authored by David Duarte's avatar David Duarte
Browse files

Remove libbluetooth_jni dependencies in fluoride_basic_defaults 

Test: mma
Bug: 279502784
Change-Id: Iff2afd21318a8f61424a04e7bed6edf732e3dcd6
parent 6aec0a74

android/app/Android.bp

+14 −0
Original line number Diff line number Diff line
@@ -67,11 +67,14 @@ cc_library_shared { 
        "packages/modules/Bluetooth/system/types",

    ],

    static_libs: [

        "android.system.suspend.control-V1-ndk",

        "avrcp-target-service",

        "lib-bt-packets-avrcp",

        "lib-bt-packets-base",

        "libFraunhoferAAC",

        "libaudio-a2dp-hw-utils",

        "libbluetooth",

        "libbluetooth-dumpsys",

        "libbluetooth-types",

        "libbluetooth_core_rs",

        "libbluetooth_core_rs_bridge",
@@ -80,6 +83,8 @@ cc_library_shared { 
        "libbt-bta-core",

        "libbt-common",

        "libbt-hci",

        "libbt-sbc-decoder",

        "libbt-sbc-encoder",

        "libbt-stack",

        "libbt-stack-core",

        "libbtcore",
@@ -90,13 +95,22 @@ cc_library_shared { 
        "libc++fs",

        "libchrome",

        "libevent",

        "libg722codec",

        "liblc3",

        "libmodpb64",

        "libopus",

        "libosi",

        "libudrv-uipc",

    ],

    shared_libs: [

        "android.hardware.bluetooth.audio-V3-ndk",

        "android.hardware.bluetooth.audio@2.0",

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

        "android.system.suspend-V1-ndk",

        "libbinder_ndk",

        "libfmq",

        "libnativehelper",

    ],

    sanitize: {

        scs: true,

system/build/Android.bp

+0 −16
Original line number Diff line number Diff line
@@ -116,38 +116,22 @@ cc_defaults { 
        "com.android.btservices",

    ],

    shared_libs: [

        "android.hardware.bluetooth.audio@2.0",

        "android.hardware.bluetooth.audio@2.1",

        "libbase",

        "libbinder_ndk",

        "libcrypto",

        "libfmq",

        "libnativehelper",

    ],

    static_libs: [

        "android.hardware.bluetooth.a2dp@1.0",

        "libFraunhoferAAC",

        "libbluetooth-dumpsys",

        "libbt-protos-lite",

        "libbt-sbc-decoder",

        "libbt-sbc-encoder",

        "libflatbuffers-cpp",

        "libg722codec",

        "liblc3",

        "libopus",

        "libprotobuf-cpp-lite",

        "libudrv-uipc",

    ],

    target: {

        android: {

            shared_libs: [

                "android.system.suspend-V1-ndk",

                "libPlatformProperties",

                "libaaudio",

            ],

            static_libs: [

                "android.system.suspend.control-V1-ndk",

            ],

        },

    },

}