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

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

Merge "[BP CLEANUP] Format bpfmt -s conflict 1/2" into tm-qpr-dev-plus-aosp am: 69aa40a2 

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



Change-Id: I602d40170733fff8cf2f1baf4fc1421af1428fc0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 27c46e83 69aa40a2

system/stack/Android.bp

+5 −5
Original line number Diff line number Diff line
@@ -1074,8 +1074,8 @@ cc_test { 
        "btm/btm_ble_cont_energy.cc",

        "btm/btm_ble_gap.cc",

        "btm/btm_ble_multi_adv.cc",

        "btm/btm_ble_scanner.cc",

        "btm/btm_ble_privacy.cc",

        "btm/btm_ble_scanner.cc",

        "btm/btm_client_interface.cc",

        "btm/btm_dev.cc",

        "btm/btm_devctl.cc",
@@ -1083,18 +1083,18 @@ cc_test { 
        "btm/btm_iot_config.cc",

        "btm/btm_iso.cc",

        "btm/btm_main.cc",

        "btm/btm_scn.cc",

        "btm/btm_sco.cc",

        "btm/btm_sco_hci.cc",

        "btm/btm_sco_hfp_hal.cc",

        "btm/btm_scn.cc",

        "btm/btm_sec.cc",

        "btm/hfp_msbc_encoder.cc",

        "btm/hfp_msbc_decoder.cc",

        "btm/hfp_msbc_encoder.cc",

        "metrics/stack_metrics_logging.cc",

        "test/btm/peer_packet_types_test.cc",

        "test/btm/sco_hci_test.cc",

        "test/btm/stack_btm_test.cc",

        "test/btm/stack_btm_regression_tests.cc",

        "test/btm/peer_packet_types_test.cc",

        "test/btm/stack_btm_test.cc",

        "test/common/mock_eatt.cc",

    ],

    static_libs: [