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

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

Merge changes Id8877d22,I73e06c0d,I9d13e817 am: b87bfccf am: 3544825b am:... 

Merge changes Id8877d22,I73e06c0d,I9d13e817 am: b87bfccf am: 3544825b am: 6b77c8c0 am: 7b7e8d77

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



Change-Id: I32454874d8bdfac03de337bd4109b1e4e68c1852
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 31815d4f 7b7e8d77

android/app/Android.bp

+0 −7
Original line number Diff line number Diff line
@@ -201,13 +201,6 @@ android_app { 
        optimize: false,

        proguard_flags_files: ["proguard.flags"],

    },

    required: [

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

    ],

    apex_available: [

        "com.android.btservices",

    ],

system/btcore/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -98,8 +98,6 @@ cc_test { 
        "test/property_test.cc",

    ],

    shared_libs: [

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

        "liblog",

    ],

    static_libs: [

system/btif/Android.bp

+2 −6
Original line number Diff line number Diff line
@@ -252,8 +252,6 @@ cc_test { 
    shared_libs: [

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

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

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

        "libaaudio",

        "libbinder_ndk",

        "libcrypto",
@@ -262,6 +260,8 @@ cc_test { 
    ],

    static_libs: [

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

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

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

        "libFraunhoferAAC",

        "libbluetooth-types",
@@ -325,10 +325,6 @@ cc_test { 
        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    shared_libs: [

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

    ],

    static_libs: [

        "libbluetooth-types",

        "libflatbuffers-cpp",

system/common/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -106,8 +106,6 @@ cc_test { 
        "test/thread_performance_test.cc",

    ],

    shared_libs: [

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

        "liblog",

    ],

    static_libs: [

system/device/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ cc_test { 
        "test/interop_test.cc",

    ],

    shared_libs: [

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

        "liblog",

    ],

    static_libs: [
@@ -79,8 +77,6 @@ cc_test { 
        "test/device_iot_config_test.cc",

    ],

    shared_libs: [

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

        "libdl",

        "liblog",

    ],