From fdbc494c694240b3d1169d35f6c8c74089d775d5 Mon Sep 17 00:00:00 2001 From: Dan Shi Date: Tue, 7 Apr 2020 14:38:56 -0700 Subject: [PATCH] Remove references of VtsHalHidlTargetTestBase Bug: 147894326 Test: build Change-Id: If847cc3aa5bb17682b92266f5460efe9d3fadfab --- Android.bp | 14 +++++++++++++- broadcastradio/common/vts/utils/Android.bp | 3 --- tv/tuner/1.0/vts/functional/DemuxTests.h | 4 +--- tv/tuner/1.0/vts/functional/FilterTests.h | 6 +++--- tv/tuner/1.0/vts/functional/FrontendTests.h | 4 ++-- .../VtsHalTvTunerV1_0TestConfigurations.h | 2 ++ wifi/1.0/vts/functional/wifi_hidl_call_util.h | 3 +-- wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp | 2 -- .../1.0/vts/functional/hostapd_hidl_test_utils.cpp | 3 +-- .../vts/functional/supplicant_hidl_test_utils.cpp | 1 - .../functional/supplicant_hidl_test_utils_1_2.cpp | 1 - .../functional/supplicant_p2p_iface_hidl_test.cpp | 2 -- .../functional/supplicant_hidl_test_utils_1_3.cpp | 1 - 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Android.bp b/Android.bp index f64968f7b4..9e1df132a7 100644 --- a/Android.bp +++ b/Android.bp @@ -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", + ], +} diff --git a/broadcastradio/common/vts/utils/Android.bp b/broadcastradio/common/vts/utils/Android.bp index d3edc76678..24fea0bb2d 100644 --- a/broadcastradio/common/vts/utils/Android.bp +++ b/broadcastradio/common/vts/utils/Android.bp @@ -25,8 +25,5 @@ cc_library_static { "-Wextra", "-Werror", ], - static_libs: [ - "VtsHalHidlTargetTestBase", - ], group_static_libs: true, } diff --git a/tv/tuner/1.0/vts/functional/DemuxTests.h b/tv/tuner/1.0/vts/functional/DemuxTests.h index f405a79ae8..a72c09fd0c 100644 --- a/tv/tuner/1.0/vts/functional/DemuxTests.h +++ b/tv/tuner/1.0/vts/functional/DemuxTests.h @@ -14,8 +14,6 @@ * limitations under the License. */ -#include -#include #include #include #include @@ -54,4 +52,4 @@ class DemuxTests { static AssertionResult success() { return ::testing::AssertionSuccess(); } sp mDemux; -}; \ No newline at end of file +}; diff --git a/tv/tuner/1.0/vts/functional/FilterTests.h b/tv/tuner/1.0/vts/functional/FilterTests.h index eab963bc34..3cc06e578d 100644 --- a/tv/tuner/1.0/vts/functional/FilterTests.h +++ b/tv/tuner/1.0/vts/functional/FilterTests.h @@ -14,8 +14,6 @@ * limitations under the License. */ -#include -#include #include #include #include @@ -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 mUsedFilterIds; uint32_t mFilterId = -1; -}; \ No newline at end of file +}; diff --git a/tv/tuner/1.0/vts/functional/FrontendTests.h b/tv/tuner/1.0/vts/functional/FrontendTests.h index 701be826d5..1a9bec9627 100644 --- a/tv/tuner/1.0/vts/functional/FrontendTests.h +++ b/tv/tuner/1.0/vts/functional/FrontendTests.h @@ -14,8 +14,6 @@ * limitations under the License. */ -#include -#include #include #include #include @@ -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 diff --git a/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TestConfigurations.h b/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TestConfigurations.h index 10c60142ba..538773a209 100644 --- a/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TestConfigurations.h +++ b/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TestConfigurations.h @@ -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, diff --git a/wifi/1.0/vts/functional/wifi_hidl_call_util.h b/wifi/1.0/vts/functional/wifi_hidl_call_util.h index f3ca517fe6..3be14c33dd 100644 --- a/wifi/1.0/vts/functional/wifi_hidl_call_util.h +++ b/wifi/1.0/vts/functional/wifi_hidl_call_util.h @@ -16,13 +16,12 @@ #pragma once +#include #include #include #include #include -#include - namespace { namespace detail { template diff --git a/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp b/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp index c1542dcb59..3ff33a564b 100644 --- a/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp +++ b/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp @@ -16,8 +16,6 @@ #include -#include - #include #include "wifi_hidl_call_util.h" diff --git a/wifi/hostapd/1.0/vts/functional/hostapd_hidl_test_utils.cpp b/wifi/hostapd/1.0/vts/functional/hostapd_hidl_test_utils.cpp index 6058fd2d5f..d4063fe258 100644 --- a/wifi/hostapd/1.0/vts/functional/hostapd_hidl_test_utils.cpp +++ b/wifi/hostapd/1.0/vts/functional/hostapd_hidl_test_utils.cpp @@ -14,7 +14,6 @@ * limitations under the License. */ -#include #include #include @@ -148,4 +147,4 @@ bool is_1_1(const sp& 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; -} \ No newline at end of file +} diff --git a/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp b/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp index 6fe6fc5936..38153238b8 100644 --- a/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp +++ b/wifi/supplicant/1.0/vts/functional/supplicant_hidl_test_utils.cpp @@ -14,7 +14,6 @@ * limitations under the License. */ -#include #include #include diff --git a/wifi/supplicant/1.2/vts/functional/supplicant_hidl_test_utils_1_2.cpp b/wifi/supplicant/1.2/vts/functional/supplicant_hidl_test_utils_1_2.cpp index 480929af2b..46d5a61156 100644 --- a/wifi/supplicant/1.2/vts/functional/supplicant_hidl_test_utils_1_2.cpp +++ b/wifi/supplicant/1.2/vts/functional/supplicant_hidl_test_utils_1_2.cpp @@ -14,7 +14,6 @@ * limitations under the License. */ -#include #include #include "supplicant_hidl_test_utils.h" diff --git a/wifi/supplicant/1.2/vts/functional/supplicant_p2p_iface_hidl_test.cpp b/wifi/supplicant/1.2/vts/functional/supplicant_p2p_iface_hidl_test.cpp index 2b63ad0ea0..7b96b8714a 100644 --- a/wifi/supplicant/1.2/vts/functional/supplicant_p2p_iface_hidl_test.cpp +++ b/wifi/supplicant/1.2/vts/functional/supplicant_p2p_iface_hidl_test.cpp @@ -16,8 +16,6 @@ #include -#include - #include #include #include diff --git a/wifi/supplicant/1.3/vts/functional/supplicant_hidl_test_utils_1_3.cpp b/wifi/supplicant/1.3/vts/functional/supplicant_hidl_test_utils_1_3.cpp index dbf2b91fe7..424c107bfd 100644 --- a/wifi/supplicant/1.3/vts/functional/supplicant_hidl_test_utils_1_3.cpp +++ b/wifi/supplicant/1.3/vts/functional/supplicant_hidl_test_utils_1_3.cpp @@ -14,7 +14,6 @@ * limitations under the License. */ -#include #include #include "supplicant_hidl_test_utils.h"