diff options
| author | Devin Moore <devinmoore@google.com> | 2024-04-02 16:37:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-02 16:37:00 +0000 |
| commit | bc4f870aaac6b292a10b1d6e9849bf4124dc9f11 (patch) | |
| tree | 13b516dadb23ade1e64018b7860bfd38d72ab836 /init | |
| parent | 42fe7733a679666311d1ddd36cf4f3051506be7c (diff) | |
| parent | a5521b0d9f53412454448f07c5bfaeb83a8bae84 (diff) | |
| download | core-bc4f870aaac6b292a10b1d6e9849bf4124dc9f11.tar.gz | |
Merge "init_kill_services_test: don't always try to kill hwservicemanager" into main
Diffstat (limited to 'init')
| -rw-r--r-- | init/test_kill_services/Android.bp | 5 | ||||
| -rw-r--r-- | init/test_kill_services/init_kill_services_test.cpp | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/init/test_kill_services/Android.bp b/init/test_kill_services/Android.bp index 37361a813..ada87d804 100644 --- a/init/test_kill_services/Android.bp +++ b/init/test_kill_services/Android.bp @@ -10,7 +10,10 @@ package { cc_test { name: "init_kill_services_test", srcs: ["init_kill_services_test.cpp"], - shared_libs: ["libbase"], + shared_libs: [ + "libbase", + "libhidlbase", + ], test_suites: ["general-tests"], // TODO(b/153565474): switch back to auto-generation diff --git a/init/test_kill_services/init_kill_services_test.cpp b/init/test_kill_services/init_kill_services_test.cpp index 510ad8aee..3af92bb55 100644 --- a/init/test_kill_services/init_kill_services_test.cpp +++ b/init/test_kill_services/init_kill_services_test.cpp @@ -18,15 +18,20 @@ #include <android-base/logging.h> #include <android-base/properties.h> +#include <hidl/ServiceManagement.h> #include <iostream> using ::android::base::GetProperty; using ::android::base::SetProperty; using ::android::base::WaitForProperty; +using ::android::hardware::isHidlSupported; using std::literals::chrono_literals::operator""s; void ExpectKillingServiceRecovers(const std::string& service_name) { + if (!isHidlSupported() && service_name == "hwservicemanager") { + GTEST_SKIP() << "No HIDL support on device so hwservicemanager will not be running"; + } LOG(INFO) << "before we say hi to " << service_name << ", I can't have apexd around!"; // b/280514080 - servicemanager will restart apexd, and apexd will restart the |