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

Commit b0a38e23 authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge "net_test_stack: Remove shared audio dependencies" into main am: 6720eaef am: 8da3255b 

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



Change-Id: Iecddca6dd12ec3b7b923c6212d03264853b5e6e2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c068caac 8da3255b

system/stack/Android.bp

+23 −11
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ cc_test { 
    defaults: [

        "fluoride_defaults",

        "latest_android_hardware_audio_common_ndk_static",

        "latest_android_hardware_bluetooth_audio_ndk_shared",

        "latest_android_hardware_bluetooth_audio_ndk_static",

        "latest_android_media_audio_common_types_ndk_static",

        "mts_defaults",

    ],
@@ -689,17 +689,12 @@ cc_test { 
        "test/stack_avrcp_test.cc",

    ],

    shared_libs: [

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

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

        "libPlatformProperties",

        "libaaudio",

        "libbase",

        "libbinder_ndk",

        "libcrypto",

        "libcutils",

        "libdl",

        "libevent",

        "libfmq",

        "libhidlbase",

        "liblog",

        "libstatssocket",
@@ -708,16 +703,19 @@ cc_test { 
        "server_configurable_flags",

    ],

    static_libs: [

        "android.hardware.audio.common@5.0",

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

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

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

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

        "android.hardware.common-V2-ndk",

        "android.hardware.common.fmq-V1-ndk",

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

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

        "libFraunhoferAAC",

        "libaudio-a2dp-hw-utils",

        "libbase",

        "libbluetooth-dumpsys",

        "libbluetooth-for-tests",

        "libbluetooth-gdx",

        "libbluetooth-types",

        "libbluetooth_core_rs",
@@ -740,6 +738,7 @@ cc_test { 
        "libbtif",

        "libbtif-core",

        "libchrome",

        "libfmq",

        "libg722codec",

        "liblc3",

        "libopus",
@@ -748,9 +747,22 @@ cc_test { 
        "libstatslog_bt",

        "libudrv-uipc",

    ],

    whole_static_libs: [

        "libbluetooth-for-tests",

    target: {

        android: {

            shared_libs: [

                "libbinder_ndk",

            ],

            static_libs: [

                "android.hardware.bluetooth@1.0",

                "android.hardware.bluetooth@1.1",

            ],

        },

        host: {

            static_libs: [

                "libbinder_ndk",

            ],

        },

    },

    header_libs: ["libbluetooth_headers"],

}