diff options
| author | Yuexi Ma <yuexima@google.com> | 2017-03-10 20:58:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-03-10 20:58:04 +0000 |
| commit | 4f4fdaf664d708061d804edceb7c80f0851b7243 (patch) | |
| tree | 54416f3a03e383d6787a6f9defb0e07ad442a67b /bluetooth | |
| parent | 66a4ca3c928c08f2aa96a5ba1b60e93fa156d26c (diff) | |
| parent | 6b8720110bf2d40ac1364c364a85c31b358889f1 (diff) | |
| download | android_hardware_interfaces-4f4fdaf664d708061d804edceb7c80f0851b7243.tar.gz android_hardware_interfaces-4f4fdaf664d708061d804edceb7c80f0851b7243.tar.bz2 android_hardware_interfaces-4f4fdaf664d708061d804edceb7c80f0851b7243.zip | |
Merge "Change vts target base test class name"
Diffstat (limited to 'bluetooth')
| -rw-r--r-- | bluetooth/1.0/vts/functional/Android.bp | 2 | ||||
| -rw-r--r-- | bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bluetooth/1.0/vts/functional/Android.bp b/bluetooth/1.0/vts/functional/Android.bp index cb1abe81c..d2e655369 100644 --- a/bluetooth/1.0/vts/functional/Android.bp +++ b/bluetooth/1.0/vts/functional/Android.bp @@ -28,7 +28,7 @@ cc_test { "libutils", "android.hardware.bluetooth@1.0", ], - static_libs: ["VtsHalHidlTargetBaseTest"], + static_libs: ["VtsHalHidlTargetTestBase"], cflags: [ "-O0", "-g", diff --git a/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp b/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp index c8c7cb583..9a4efae0b 100644 --- a/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp +++ b/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp @@ -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"); |