diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index b19a74a..15a4e83 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -1069,11 +1069,13 @@
 OBJS_c += src/utils/edit_simple.c
 endif
 
+ifeq ($(filter gce_x86 gce_x86_64 calypso, $(TARGET_DEVICE)),)
 ifdef CONFIG_CTRL_IFACE_HIDL
 HOSTAPD_USE_HIDL=y
 L_CFLAGS += -DCONFIG_CTRL_IFACE_HIDL
 L_CPPFLAGS = -Wall -Werror
 endif
+endif
 
 ########################