commit 47882424c244cd60c71c305b34ecfd4a5e320511
author Bjoern Johansson <bjoernj@google.com> Mon Mar 19 11:10:13 2018 -0700
committer Bjoern Johansson <bjoernj@google.com> Tue Mar 20 20:10:03 2018 +0000
tree 3c76da05b3c30242ba43c77d6f613909f938d8fc
parent fb012fc1559e32df406415880f1a567f12e3f424

Don't compile the HIDL interface for the emulator

Similar to GCE the public emulator uses hostapd to simulate a virtual
access point. This means that there is no need for HIDL support in
hostapd for these target devices.

BUG: 74514143
Test: Emulator images compile and run with WiFi
Change-Id: Id74388e90639300c2eab2d465c8b6591d598043c

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