commit 5e9dc33f4df77793bcd9bdcbb417ab66129ee63a
author Bjoern Johansson <bjoernj@google.com> Fri Mar 23 16:11:40 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 23 16:11:40 2018 +0000
tree 298f566580caef8255f5951a57a460a05c70ff76
parent c9083379699f35a86d716d57cfd3dd049a51d54d
parent 7d97a56cb0625e18bab3b85bf90b006acf56c6cf

Merge "Don't compile the HIDL interface for the emulator" into pi-dev am: d58139f664
am: 7d97a56cb0

Change-Id: I70d58fbfa128b3d9ebd79a7c7fbbe18dca997d54

hostapd/Android.mk

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