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

Commit e0c316fa authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge changes Ie8ee5b2e,I1d3c6b98 am: 9a821a22 

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



Change-Id: Ide8c9b36cbde96ff56cb18a9f15e7f33deff9215
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ef8e16e3 9a821a22

framework/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ java_sdk_library { 
        "//external/sl4a/Common",

        "//frameworks/opt/wear",

        "//packages/modules/Bluetooth/android/app/tests/unit",

        "//packages/modules/Bluetooth/framework/tests/bumble",

        "//packages/modules/Bluetooth/android/pandora/server",

        "//packages/modules/Bluetooth/framework/tests/bumble",

        "//packages/modules/Bluetooth/service",

        "//packages/modules/Connectivity/nearby/tests/multidevices/clients/test_support/fastpair_provider",

        "//packages/services/Car/car-builtin-lib",

framework/tests/bumble/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ android_test_helper_app { 
    ],



    static_libs: [

        "androidx.core_core",

        "androidx.test.ext.truth",

        "androidx.test.rules",

        "androidx.core_core",

        "grpc-java-lite",

        "grpc-java-okhttp-client-lite",

        "opencensus-java-contrib-grpc-metrics",

system/bta/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -352,11 +352,11 @@ cc_test { 
        "sys/bta_sys_conn.cc",

        "sys/bta_sys_main.cc",

        "sys/utl.cc",

        "test/bta_hf_client_add_record_test.cc",

        "test/bta_api_test.cc",

        "test/bta_av_test.cc",

        "test/bta_dm_test.cc",

        "test/bta_gatt_test.cc",

        "test/bta_hf_client_add_record_test.cc",

        "test/bta_pan_test.cc",

        "test/bta_sdp_test.cc",

    ],

system/btif/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -258,8 +258,8 @@ cc_test { 
        "libhidlbase",

    ],

    static_libs: [

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

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

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

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

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

system/stack/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -327,8 +327,8 @@ cc_test { 
        "libz",

    ],

    static_libs: [

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

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

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

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

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",