Merge changes from topic "hidl-multi-lazy-test" into rvc-dev
* changes:
hal_implementation_test: allow cf test HIDL ifaces
add hidl_lazy_test
diff --git a/shared/device.mk b/shared/device.mk
index 741788f..c23337c 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -152,7 +152,8 @@
# Packages for testing
#
PRODUCT_PACKAGES += \
- aidl_lazy_test_server
+ aidl_lazy_test_server \
+ hidl_lazy_test_server
DEVICE_PACKAGE_OVERLAYS := device/google/cuttlefish/shared/overlay
# PRODUCT_AAPT_CONFIG and PRODUCT_AAPT_PREF_CONFIG are intentionally not set to
diff --git a/tests/hal/hal_implementation_test.cpp b/tests/hal/hal_implementation_test.cpp
index baf3afe..2c33483 100644
--- a/tests/hal/hal_implementation_test.cpp
+++ b/tests/hal/hal_implementation_test.cpp
@@ -133,7 +133,7 @@
"android.system",
};
for (const std::string& package : kAospPackages) {
- if (name.inPackage(package) && !isHidlPackageWhitelist(name)) {
+ if (name.inPackage(package)) {
return true;
}
}
@@ -197,6 +197,7 @@
for (const FQName& f : allTreeHidlInterfaces()) {
if (!isAospHidlInterface(f)) continue;
+ if (isHidlPackageWhitelist(f)) continue;
unimplemented[f.package()][f.getPackageMajorVersion()].insert(f.getPackageMinorVersion());
}