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

Commit abdcf557 authored by David Duarte's avatar David Duarte Committed by Automerger Merge Worker
Browse files

Merge changes If51ee2af,I254fe663 am: ae8e371a am: e76518df am: 960d451d 

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



Change-Id: Ie94025de8cc8cc1f204ea65a02dee297021957c8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c746bb31 960d451d

system/build/Android.bp

+10 −48
Original line number Diff line number Diff line
@@ -158,67 +158,41 @@ cc_defaults { 
        "com.android.btservices",

    ],

    shared_libs: [

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

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

        "libbase",

        "libbinder_ndk",

        "libcrypto",

        "liblog",

        "libfmq",

        "libnativehelper",

        "libtinyxml2",

    ],

    static_libs: [

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

        "libFraunhoferAAC",

        "libbluetooth-dumpsys",

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbluetooth_rust_interop",

        "libbt-platform-protos-lite",

        "libbt-protos-lite",

        "libbt-sbc-decoder",

        "libbt-sbc-encoder",

        "libbt_callbacks_cxx",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libflatbuffers-cpp",

        "libg722codec",

        "liblc3",

        "libopus",

        "libprotobuf-cpp-lite",

        "libstatslog_bt",

        "libudrv-uipc",

    ],

    target: {

        android: {

            shared_libs: [

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

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

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

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

                "libPlatformProperties",

                "libaaudio",

                "libbinder_ndk",

                "libcutils",

                "libfmq",

                "libhidlbase",

                "libtinyxml2",

                "libutils",

                "libz",

            ],

            static_libs: [

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

            ],

        },

        host_linux: {

            shared_libs: [

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

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

                "libbinder_ndk",

                "libcutils",

                "libfmq",

                "libhidlbase",

                "libtinyxml2",

                "libutils",

                "libz",

            ],

        },

    },

}
@@ -227,7 +201,6 @@ cc_defaults { 
    defaults: ["fluoride_basic_defaults"],

    static_libs: [

        "avrcp-target-service",

        "lib-bt-packets",

        "lib-bt-packets-avrcp",

        "lib-bt-packets-base",

        "libaudio-a2dp-hw-utils",
@@ -255,32 +228,21 @@ cc_defaults { 
    ],

    static_libs: [

        "libbluetooth_gd",

        "libbluetooth_rust_interop",

        "libbt_callbacks_cxx",

        "libbt_shim_bridge",

        "libbt_shim_ffi",

        "libbt_shim_ffi",

        "libstatslog_bt",

    ],

    target: {

        darwin: {

            // libstatslog_bt -> libbinder doesn't build on mac

            enabled: false,

        },

        host_linux: {

    shared_libs: [

        "libcutils",

        "libhidlbase",

                "libstatslog_bt",

        "libutils",

    ],

    target: {

        darwin: {

            // libstatslog_bt -> libbinder doesn't build on mac

            enabled: false,

        },

        android: {

            shared_libs: [

                "libcutils",

                "libhidlbase",

                "libstatssocket",

                "libutils",

            ],

            sanitize: {

                misc_undefined: ["bounds"],