Revert "Skip these lazy tests when HIDL is not supported"

It's now skipped when the services aren't registered, so this isn't
needed.

This reverts commit d0b8ff93f54d535433c662c590da6635f309b35d.
This keeps the original Android.bp changes in that commit that moves the
generated HIDL libraries from shared to static to allow the test to be
run on a device that doesn't include the services and their
dependencies.

Test: atest hidl_lazy_test
Bug: 218588089
Change-Id: I88c00c233b89dc0feecffbfafad29eef94cf94e9

1 files changed, 0 insertions, 10 deletions

diff --git a/test/lazy_test/hidl_lazy_test.cpp b/test/lazy_test/hidl_lazy_test.cpp
index 69525417..381e16c4 100644
--- a/test/lazy_test/hidl_lazy_test.cpp
+++ b/test/lazy_test/hidl_lazy_test.cpp
@@ -36,7 +36,6 @@
 #include <hidl/HidlSupport.h>
 #include <hidl/HidlTransportSupport.h>
 #include <hidl/HidlTransportUtils.h>
-#include <hidl/ServiceManagement.h>
 #include <hwbinder/IPCThreadState.h>
 
 using ::android::FqInstance;
@@ -103,8 +102,6 @@ class HidlLazyTestBase : public ::testing::Test {
 class HidlLazyTest : public HidlLazyTestBase {
   protected:
     void SetUp() override {
-        if (!android::hardware::isHidlSupported())
-            GTEST_SKIP() << "HIDL is not supported on this device";
         HidlLazyTestBase::SetUp();
         for (const auto& instance : gInstances) {
             ASSERT_FALSE(isServiceRunning(instance))
@@ -116,8 +113,6 @@ class HidlLazyTest : public HidlLazyTestBase {
     }
 
     void TearDown() override {
-        // If we skipped the setup, then we skip the TearDown.
-        if (!android::hardware::isHidlSupported()) return;
         std::cout << "Waiting " << SHUTDOWN_WAIT_TIME << " seconds before checking that the "
                   << "service has shut down." << std::endl;
         IPCThreadState::self()->flushCommands();
@@ -133,11 +128,6 @@ class HidlLazyTest : public HidlLazyTestBase {
 class HidlLazyCbTest : public HidlLazyTestBase {
   protected:
     static constexpr size_t CALLBACK_SHUTDOWN_WAIT_TIME = 5;
-    void SetUp() override {
-        if (!android::hardware::isHidlSupported())
-            GTEST_SKIP() << "HIDL is not supported on this device";
-        HidlLazyTestBase::SetUp();
-    }
 };
 
 static constexpr size_t NUM_IMMEDIATE_GET_UNGETS = 100;