Android: Move hostapd to vendor partition

Move hostapd to /vendor/bin/ because it's only used by WIFI HAL.

Signed-off-by: Jeff Vander Stoep <jeffv@google.com>

diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 73f96ed5e48a6ae12812c28622ae0213afa93a3c..8fd6fa09f9799f63f6780a48bc74da7e2f9f2828 100644 (file)
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -1066,6 +1066,7 @@ endif
 include $(CLEAR_VARS)
 LOCAL_MODULE := hostapd_cli
 LOCAL_MODULE_TAGS := debug
+LOCAL_PROPRIETARY_MODULE := true
 LOCAL_SHARED_LIBRARIES := libc libcutils liblog
 LOCAL_CFLAGS := $(L_CFLAGS)
 LOCAL_SRC_FILES := $(OBJS_c)
@@ -1076,6 +1077,7 @@ include $(BUILD_EXECUTABLE)
 include $(CLEAR_VARS)
 LOCAL_MODULE := hostapd
 LOCAL_MODULE_TAGS := optional
+LOCAL_PROPRIETARY_MODULE := true
 ifdef CONFIG_DRIVER_CUSTOM
 LOCAL_STATIC_LIBRARIES := libCustomWifi
 endif

diff --git a/hostapd/hostapd.android.rc b/hostapd/hostapd.android.rc
index 83e8d8791e3cb5a9a997238c972da652a7229d7e..d8e6a0698b6118a887fcea546ae9fcdcaccac5ab 100644 (file)
--- a/hostapd/hostapd.android.rc
+++ b/hostapd/hostapd.android.rc
@@ -9,7 +9,7 @@
 on post-fs-data
     mkdir /data/misc/wifi/hostapd 0770 wifi wifi
 
-service hostapd /system/bin/hostapd \
+service hostapd /vendor/bin/hostapd \
         -e /data/misc/wifi/entropy.bin \
         /data/misc/wifi/hostapd.conf
     class main