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

Commit a8239094 authored by Yuexi Ma's avatar Yuexi Ma Committed by android-build-merger
Browse files

Merge "Change vts target base test class name" 

am: 4f4fdaf6

Change-Id: Id82295a163c4abbd0b9fc1ac8fde12ebd9a43030
parents a62b176c 4f4fdaf6

bluetooth/1.0/vts/functional/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ cc_test { 
        "libutils",

        "android.hardware.bluetooth@1.0",

    ],

    static_libs: ["VtsHalHidlTargetBaseTest"],

    static_libs: ["VtsHalHidlTargetTestBase"],

    cflags: [

        "-O0",

        "-g",

bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <hardware/bluetooth.h>

#include <utils/Log.h>



#include <VtsHalHidlTargetBaseTest.h>

#include <VtsHalHidlTargetTestBase.h>

#include <condition_variable>

#include <mutex>

#include <queue>
@@ -117,11 +117,11 @@ class ThroughputLogger { 
};



// The main test class for Bluetooth HIDL HAL.

class BluetoothHidlTest : public ::testing::VtsHalHidlTargetBaseTest {

class BluetoothHidlTest : public ::testing::VtsHalHidlTargetTestBase {

 public:

  virtual void SetUp() override {

    // currently test passthrough mode only

    bluetooth = ::testing::VtsHalHidlTargetBaseTest::getService<IBluetoothHci>();

    bluetooth = ::testing::VtsHalHidlTargetTestBase::getService<IBluetoothHci>();

    ASSERT_NE(bluetooth, nullptr);

    ALOGI("%s: getService() for bluetooth is %s", __func__,

          bluetooth->isRemote() ? "remote" : "local");

ir/1.0/vts/functional/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ cc_test { 
        "libutils",

        "android.hardware.ir@1.0",

    ],

    static_libs: ["VtsHalHidlTargetBaseTest"],

    static_libs: ["VtsHalHidlTargetTestBase"],

    cflags: [

        "-O0",

        "-g",

ir/1.0/vts/functional/VtsHalIrV1_0TargetTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <android/hardware/ir/1.0/IConsumerIr.h>

#include <android/hardware/ir/1.0/types.h>



#include <VtsHalHidlTargetBaseTest.h>

#include <VtsHalHidlTargetTestBase.h>

#include <algorithm>



using ::android::hardware::ir::V1_0::IConsumerIr;
@@ -31,10 +31,10 @@ using ::android::hardware::Return; 
using ::android::sp;



// The main test class for IR HIDL HAL.

class ConsumerIrHidlTest : public ::testing::VtsHalHidlTargetBaseTest {

class ConsumerIrHidlTest : public ::testing::VtsHalHidlTargetTestBase {

 public:

  virtual void SetUp() override {

    ir = ::testing::VtsHalHidlTargetBaseTest::getService<IConsumerIr>();

    ir = ::testing::VtsHalHidlTargetTestBase::getService<IConsumerIr>();

    ASSERT_NE(ir, nullptr);

  }

nfc/1.0/vts/functional/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ cc_test { 
        "libutils",

        "android.hardware.nfc@1.0",

    ],

    static_libs: ["VtsHalHidlTargetBaseTest"],

    static_libs: ["VtsHalHidlTargetTestBase"],

    cflags: [

        "-O0",

        "-g",