tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove references of VtsHalHidlTargetTestBase

Browse source 
Bug: 147894326
Test: build
Change-Id: If847cc3aa5bb17682b92266f5460efe9d3fadfab
This commit is contained in:
Dan Shi 2020-04-07 14:38:56 -07:00
parent 62bc360c11
commit fdbc494c69
13 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Android.bp
View file

@ -21,7 +21,7 @@ cc_defaults {
// Lists all dependencies that can *not* be expected on the device.
static_libs: [
"VtsHalHidlTargetTestBase",
"VtsHalHidlTestUtils",
"libhidl-gen-utils",
],
@ -47,3 +47,15 @@ cc_defaults {
require_root: true,
}
// TODO: Remove this after all vts tests under vendor/qcom are converted to
// parameterized gtest.
cc_defaults {
name: "Vts10HalTargetTestDefaults",
defaults: [
"VtsHalTargetTestDefaults",
],
static_libs: [
"VtsHalHidlTargetTestBase",
],
}

3
broadcastradio/common/vts/utils/Android.bp
View file

@ -25,8 +25,5 @@ cc_library_static {
"-Wextra",
"-Werror",
],
static_libs: [
"VtsHalHidlTargetTestBase",
],
group_static_libs: true,
}

4
tv/tuner/1.0/vts/functional/DemuxTests.h
View file

@ -14,8 +14,6 @@
* limitations under the License.
*/
#include <VtsHalHidlTargetTestBase.h>
#include <VtsHalHidlTargetTestEnvBase.h>
#include <android-base/logging.h>
#include <android/hardware/tv/tuner/1.0/IDemux.h>
#include <android/hardware/tv/tuner/1.0/ITuner.h>
@ -54,4 +52,4 @@ class DemuxTests {
static AssertionResult success() { return ::testing::AssertionSuccess(); }
sp<IDemux> mDemux;
};
};

6
tv/tuner/1.0/vts/functional/FilterTests.h
View file

@ -14,8 +14,6 @@
* limitations under the License.
*/
#include <VtsHalHidlTargetTestBase.h>
#include <VtsHalHidlTargetTestEnvBase.h>
#include <android-base/logging.h>
#include <android/hardware/tv/tuner/1.0/IFilter.h>
#include <android/hardware/tv/tuner/1.0/IFilterCallback.h>
@ -64,6 +62,8 @@ using android::hardware::tv::tuner::V1_0::Result;
using ::testing::AssertionResult;
using namespace std;
enum FilterEventType : uint8_t {
UNDEFINED,
SECTION,
@ -223,4 +223,4 @@ class FilterTests {
vector<uint32_t> mUsedFilterIds;
uint32_t mFilterId = -1;
};
};

4
tv/tuner/1.0/vts/functional/FrontendTests.h
View file

@ -14,8 +14,6 @@
* limitations under the License.
*/
#include <VtsHalHidlTargetTestBase.h>
#include <VtsHalHidlTargetTestEnvBase.h>
#include <android-base/logging.h>
#include <android/hardware/tv/tuner/1.0/IFrontend.h>
#include <android/hardware/tv/tuner/1.0/IFrontendCallback.h>
@ -66,6 +64,8 @@ using android::hardware::tv::tuner::V1_0::Result;
using ::testing::AssertionResult;
using namespace std;
#define INVALID_ID -1
#define WAIT_TIMEOUT 3000000000

2
tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TestConfigurations.h
View file

@ -38,6 +38,8 @@ using android::hardware::tv::tuner::V1_0::FrontendDvbtTransmissionMode;
using android::hardware::tv::tuner::V1_0::FrontendSettings;
using android::hardware::tv::tuner::V1_0::FrontendType;
using namespace std;
typedef enum {
TS_VIDEO0,
TS_VIDEO1,

3
wifi/1.0/vts/functional/wifi_hidl_call_util.h
View file

@ -16,13 +16,12 @@
#pragma once
#include <gtest/gtest.h>
#include <functional>
#include <tuple>
#include <type_traits>
#include <utility>
#include <VtsHalHidlTargetTestBase.h>
namespace {
namespace detail {
template <typename>

2
wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp
View file

@ -16,8 +16,6 @@
#include <android/log.h>
#include <VtsHalHidlTargetTestBase.h>
#include <wifi_system/interface_tool.h>
#include "wifi_hidl_call_util.h"

3
wifi/hostapd/1.0/vts/functional/hostapd_hidl_test_utils.cpp
View file

@ -14,7 +14,6 @@
* limitations under the License.
*/
#include <VtsHalHidlTargetTestBase.h>
#include <android-base/logging.h>
#include <android/hidl/manager/1.0/IServiceManager.h>
@ -148,4 +147,4 @@ bool is_1_1(const sp<IHostapd>& hostapd) {
sp<::android::hardware::wifi::hostapd::V1_1::IHostapd> hostapd_1_1 =
::android::hardware::wifi::hostapd::V1_1::IHostapd::castFrom(hostapd);
return hostapd_1_1.get() != nullptr;
}
}

1
wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp
View file

@ -14,7 +14,6 @@
* limitations under the License.
*/
#include <VtsHalHidlTargetTestBase.h>
#include <android-base/logging.h>
#include <cutils/properties.h>

1
wifi/supplicant/1.2/vts/functional/supplicant_hidl_test_utils_1_2.cpp
View file

@ -14,7 +14,6 @@
* limitations under the License.
*/
#include <VtsHalHidlTargetTestBase.h>
#include <android-base/logging.h>
#include "supplicant_hidl_test_utils.h"

2
wifi/supplicant/1.2/vts/functional/supplicant_p2p_iface_hidl_test.cpp
View file

@ -16,8 +16,6 @@
#include <android-base/logging.h>
#include <VtsHalHidlTargetTestBase.h>
#include <VtsCoreUtil.h>
#include <android/hardware/wifi/1.0/IWifi.h>
#include <android/hardware/wifi/supplicant/1.2/ISupplicantP2pIface.h>

1
wifi/supplicant/1.3/vts/functional/supplicant_hidl_test_utils_1_3.cpp
View file

@ -14,7 +14,6 @@
* limitations under the License.
*/
#include <VtsHalHidlTargetTestBase.h>
#include <android-base/logging.h>
#include "supplicant_hidl_test_utils.h"