diff options
author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2021-09-09 18:48:23 +0200 |
---|---|---|
committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2021-09-09 19:41:30 +0200 |
commit | a84f6d7a508fce427f176512e22bcac294361ac1 (patch) | |
tree | 33cd59053bf3284b40c73c5058fb8f0dd97be13a | |
parent | e936e0bf1caebcab3873003772d269d090e22d9a (diff) | |
download | device_samsung_midas_common-a84f6d7a508fce427f176512e22bcac294361ac1.tar.gz device_samsung_midas_common-a84f6d7a508fce427f176512e22bcac294361ac1.tar.bz2 device_samsung_midas_common-a84f6d7a508fce427f176512e22bcac294361ac1.zip |
WiFi: use wpa_supplicant provided service file
The Android.mk file in external/wpa_supplicant_8/wpa_supplicant
has the following:
ifeq ($(WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY), true)
LOCAL_INIT_RC=hidl/$(HIDL_INTERFACE_VERSION)/android.hardware.wifi.supplicant-service.rc
endif
And since we're using the wrapper library from wpa_supplicant,
we should rather also use the service file from there in order
to have it in sync with the code.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-rw-r--r-- | BoardConfigCommon.mk | 1 | ||||
-rw-r--r-- | init.midas.rc | 15 |
2 files changed, 1 insertions, 15 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 48aa936..0ebe27a 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -40,6 +40,7 @@ BOARD_GPU_DRIVERS := lima kmsro BOARD_HOSTAPD_DRIVER := NL80211 BOARD_WLAN_DEVICE := replicant BOARD_WPA_SUPPLICANT_DRIVER := NL80211 +WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true WPA_SUPPLICANT_VERSION := VER_0_8_X ################# diff --git a/init.midas.rc b/init.midas.rc index 6311b70..c667ef7 100644 --- a/init.midas.rc +++ b/init.midas.rc @@ -93,18 +93,3 @@ service resize2fs_partitions /system/bin/resize2fs_partitions.sh class main oneshot disabled - -service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ - -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1 \ - -g@android:wpa_wlan0 - # we will start as root and wpa_supplicant will switch to user wifi - # after setting up the capabilities required for WEXT - # user wifi - # group wifi inet keystore - interface android.hardware.wifi.supplicant@1.0::ISupplicant default - interface android.hardware.wifi.supplicant@1.1::ISupplicant default - interface android.hardware.wifi.supplicant@1.2::ISupplicant default - class main - socket wpa_wlan0 dgram 660 wifi wifi - disabled - oneshot
\ No newline at end of file |