[1/2] Android: Move hostapd to vendor partition

Message ID 20171130224551.155510-1-jeffv@google.com
State Accepted
Headers show
Series
  • [1/2] Android: Move hostapd to vendor partition
Related show

Commit Message

Jeff Vander Stoep Nov. 30, 2017, 10:45 p.m.
From: Po-Chien Hsueh <pchsueh@google.com>

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

Signed-off-by: Jeff Vander Stoep <jeffv@google.com>
---
 hostapd/Android.mk         | 2 ++
 hostapd/hostapd.android.rc | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

Comments

Jouni Malinen Dec. 9, 2017, 5:28 p.m. | #1
On Thu, Nov 30, 2017 at 02:45:51PM -0800, Jeff Vander Stoep wrote:
> Move hostapd to /vendor/bin/ because it's only used by WIFI HAL.

Thanks, applied.

Patch

diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 73f96ed5e..8fd6fa09f 100644
--- 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 83e8d8791..d8e6a0698 100644
--- 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