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

Commit 41613051 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I53a67135,I235ca85f,If3180282 am: 7c0d7635 am: 0463ca05 am: 27740026 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2508576



Change-Id: I93c0e513d41c82e3e6413ddbf2b21b5d95e30008
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 014a8dd2 27740026

bluetooth/aidl/TEST_MAPPING

+7 −1
Original line number Diff line number Diff line 
{

  "presubmit" : [

    {

      "name" : "VtsHalBluetoothTargetTest"

      "name" : "VtsHalBluetoothTargetTest",

      "options": [

        {

          // TODO(b/275847929)

          "exclude-filter": "VtsHalBluetoothTargetTest.PerInstance/BluetoothAidlTest#Cdd_C_12_1_Bluetooth5Requirements/0_android_hardware_bluetooth_IBluetoothHci_default"

        }

      ]

    }

  ]

}

bluetooth/aidl/vts/Android.bp

+15 −1
Original line number Diff line number Diff line
@@ -13,7 +13,17 @@ cc_test { 
        "VtsHalTargetTestDefaults",

        "use_libaidlvintf_gtest_helper_static",

    ],

    srcs: ["VtsHalBluetoothTargetTest.cpp"],

    srcs: [

        "VtsHalBluetoothTargetTest.cpp",

        ":BluetoothPacketSources",

        ":BluetoothHciPacketSources",

    ],

    generated_headers: [

        "BluetoothGeneratedPackets_h",

    ],

    include_dirs: [

        "packages/modules/Bluetooth/system/gd",

    ],

    shared_libs: [

        "libbase",

        "libbinder_ndk",
@@ -45,4 +55,8 @@ cc_test { 
    tidy_flags: [

        "--header-filter=^.*tools\\/rootcanal\\/(model|include|net|desktop)\\/(.(?!\\.pb\\.h))*$",

    ],

    tidy_disabled_srcs: [

        ":BluetoothPacketSources",

        ":BluetoothHciPacketSources",

    ],

}

bluetooth/aidl/vts/VtsHalBluetoothTargetTest.cpp

+359 −294

File changed.

Preview size limit exceeded, changes collapsed.