Snap for 4677756 from d58139f6646bce2b7a7afe6d28037df8786898e8 to pi-release
Change-Id: I18adf7e604c969c863c0a53f09969aee073c35ac
diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index a64ec79..b4b0fea 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -1072,7 +1072,7 @@
OBJS_c += src/utils/edit_simple.c
endif
-ifeq ($(filter gce_x86 gce_x86_64 calypso, $(TARGET_DEVICE)),)
+ifeq ($(filter gce_x86 gce_x86_64 calypso generic_x86 generic_x86_64 generic generic_arm64, $(TARGET_DEVICE)),)
ifdef CONFIG_CTRL_IFACE_HIDL
HOSTAPD_USE_HIDL=y
L_CFLAGS += -DCONFIG_CTRL_IFACE_HIDL