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

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

Merge "[BP CLEANUP] Format bpfmt -s conflict 2/2" am: 70bee993 am: 1e0d046f 

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



Change-Id: I157d6ee67adb03cd0aa8aaa9bf8fd8ce0329aeb0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bbfdef74 1e0d046f

android/app/Android.bp

+7 −7
Original line number Diff line number Diff line
@@ -164,27 +164,27 @@ android_app { 
    static_libs: [

        "android.hardware.radio-V1.0-java",

        "android.hardware.radio.sap-V1-java",

        "androidx.annotation_annotation",

        "androidx.core_core",

        "androidx.media_media",

        "androidx.lifecycle_lifecycle-livedata",

        "androidx.media_media",

        "androidx.room_room-runtime",

        "androidx.annotation_annotation",

        "bluetooth-proto-enums-java-gen",

        "bluetooth-protos-lite",

        "bluetooth.change-ids",

        "bluetooth.mapsapi",

        "bluetooth-protos-lite",

        "com.android.vcard",

        "com.android.obex",

        "com.android.vcard",

        "guava",

        "libprotobuf-java-lite",

        "mmslib",

        "modules-utils-backgroundthread",

        "modules-utils-bytesmatcher",

        "modules-utils-synchronous-result-receiver",

        "modules-utils-statemachine",

        "sap-api-java-static",

        "modules-utils-synchronous-result-receiver",

        "net-utils-services-common",

        "networkstack-client",

        "bluetooth-proto-enums-java-gen",

        "sap-api-java-static",

    ],



    plugins: [

system/audio_hal_interface/fuzzer/Android.bp

+11 −11
Original line number Diff line number Diff line
@@ -30,21 +30,21 @@ cc_defaults { 
        "libbluetooth_headers",

    ],

    shared_libs: [

        "libz",

        "libfmq",

        "libaaudio",

        "libcrypto",

        "libstatslog",

        "libbinder_ndk",

        "libstatssocket",

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

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

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

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

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

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

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

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

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

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

        "libaaudio",

        "libbinder_ndk",

        "libcrypto",

        "libfmq",

        "libstatslog",

        "libstatssocket",

        "libz",

    ],

    static_libs: [

        "libFraunhoferAAC",

system/btif/Android.bp

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

        android: {

            shared_libs: [

                "libbinder_ndk",

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

                "libbinder_ndk",

            ],

        },

    },

system/stack/Android.bp

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

    ],

    shared_libs: [

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

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

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

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

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

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

        "libaaudio",

        "libbinder_ndk",

        "libcrypto",

        "libcutils",

        "libdl",

        "libfmq",

        "libhidlbase",

        "liblog",

        "libutils",

        "libtinyxml2",

        "libutils",

        "libz",

        "libcrypto",

    ],

    static_libs: [

        "android.hardware.bluetooth.a2dp@1.0",
@@ -761,6 +761,9 @@ cc_test { 
        "test/a2dp/raw_data/*",

    ],

    srcs: [

        ":TestCommonMockFunctions",

        ":TestMockBta",

        ":TestMockStackA2dpApi",

        "a2dp/a2dp_aac.cc",

        "a2dp/a2dp_aac_decoder.cc",

        "a2dp/a2dp_aac_encoder.cc",
@@ -771,26 +774,23 @@ cc_test { 
        "a2dp/a2dp_sbc_up_sample.cc",

        "a2dp/a2dp_vendor.cc",

        "a2dp/a2dp_vendor_aptx.cc",

        "a2dp/a2dp_vendor_aptx_hd.cc",

        "a2dp/a2dp_vendor_aptx_encoder.cc",

        "a2dp/a2dp_vendor_aptx_hd.cc",

        "a2dp/a2dp_vendor_aptx_hd_encoder.cc",

        "a2dp/a2dp_vendor_ldac.cc",

        "a2dp/a2dp_vendor_ldac_decoder.cc",

        "a2dp/a2dp_vendor_ldac_encoder.cc",

        "a2dp/a2dp_vendor_opus.cc",

        "a2dp/a2dp_vendor_opus_encoder.cc",

        "a2dp/a2dp_vendor_opus_decoder.cc",

        "a2dp/a2dp_vendor_opus_encoder.cc",

        "test/a2dp/a2dp_aac_unittest.cc",

        "test/a2dp/a2dp_sbc_unittest.cc",

        "test/a2dp/a2dp_opus_unittest.cc",

        "test/a2dp/a2dp_sbc_unittest.cc",

        "test/a2dp/a2dp_vendor_ldac_unittest.cc",

        "test/a2dp/mock_bta_av_codec.cc",

        "test/a2dp/test_util.cc",

        "test/a2dp/wav_reader.cc",

        "test/a2dp/wav_reader_unittest.cc",

        ":TestCommonMockFunctions",

        ":TestMockBta",

        ":TestMockStackA2dpApi",

    ],

    shared_libs: [

        "libcrypto",

system/stack/test/fuzzers/Android.bp

+8 −8
Original line number Diff line number Diff line
@@ -45,23 +45,23 @@ cc_defaults { 
        "libudrv-uipc",

    ],

    shared_libs: [

        "libbinder",

        "libbase",

        "libcutils",

        "liblog",

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

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

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

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

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

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

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",

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

        "libaaudio",

        "libbase",

        "libbinder",

        "libbinder_ndk",

        "libcrypto",

        "libcutils",

        "libfmq",

        "libhidlbase",

        "liblog",

        "libprotobuf-cpp-lite",

        "libutils",

        "libcrypto",

    ],

}