commit dbd4616dae0f04eebd9320a72d530938910d6009
author Roger Wang <wangroger@google.com> Mon Apr 19 12:22:16 2021 +0800
committer Ahmed ElArabawy <arabawy@google.com> Tue Apr 20 01:38:41 2021 +0000
tree d7dc8ad1bb9db6204b5d6623bd4e79e0e3e0d125
parent d4cff50b12cf361cd8ca8c93ca36428fdc0444ec

remove hostapd_cli from user build

Bug: 185724245
Test: hostapd_cli doesn't include in user build
Change-Id: I78101b6ca898cdec75e92a0e4c421752aaf721bf

device.mk

diff --git a/device.mk b/device.mk
index 0855c70..ce8f543 100644
--- a/device.mk
+++ b/device.mk
@@ -652,10 +652,7 @@
 PRODUCT_COPY_FILES += \
 	device/google/gs101/wifi/coex_table.xml:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/coex_table.xml
 
-HOSTAPD := hostapd
-HOSTAPD += hostapd_cli
-PRODUCT_PACKAGES += $(HOSTAPD)
-
+PRODUCT_PACKAGES += hostapd
 PRODUCT_PACKAGES += wpa_supplicant
 PRODUCT_PACKAGES += wpa_supplicant.conf
 
@@ -663,6 +660,7 @@
 
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES += wpa_cli
+PRODUCT_PACKAGES += hostapd_cli
 endif
 
 ####################################