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

Commit 98e72aa9 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes from topic "conn.min.limit_sysprop-master" am: cb1d20f4 am: 72e678b1 

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



Change-Id: I64867d755e4a98d6cb23e09c8515571c319377bf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1097cb19 72e678b1

system/audio_hal_interface/fuzzer/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ cc_defaults { 
        "libbluetooth_headers",

    ],

    shared_libs: [

        "PlatformProperties",

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

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

        "android.hardware.bluetooth.audio@2.0",
@@ -39,6 +38,7 @@ cc_defaults { 
        "android.hardware.bluetooth@1.1",

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

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

        "libPlatformProperties",

        "libaaudio",

        "libbinder_ndk",

        "libcrypto",

system/btif/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -294,8 +294,8 @@ cc_test { 
    target: {

        android: {

            shared_libs: [

                "PlatformProperties",

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

                "libPlatformProperties",

                "libbinder_ndk",

            ],

        },

system/build/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -209,11 +209,11 @@ cc_defaults { 
    target: {

        android: {

            shared_libs: [

                "PlatformProperties",

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

system/stack/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -311,12 +311,12 @@ cc_test { 
        "test/stack_avrcp_test.cc",

    ],

    shared_libs: [

        "PlatformProperties",

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

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

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

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

        "libPlatformProperties",

        "libaaudio",

        "libbinder_ndk",

        "libcrypto",
@@ -1438,7 +1438,7 @@ cc_test { 
    target: {

        android: {

            shared_libs: [

                "PlatformProperties",

                "libPlatformProperties",

            ],

        },

    },

system/stack/test/fuzzers/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ cc_defaults { 
        "libudrv-uipc",

    ],

    shared_libs: [

        "PlatformProperties",

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

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

        "android.hardware.bluetooth.audio@2.0",
@@ -53,6 +52,7 @@ cc_defaults { 
        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

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

        "libPlatformProperties",

        "libaaudio",

        "libbase",

        "libbinder",