g12: Move supplicant service init to wpa_supplicant

Bug: 138790309
Test: boot and wifi function is ok
Change-Id: I35cf3e03566443e20799623045eacd423fd7f5c4

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 9599ca2127d89e4dfdb30a6d704551a5a400d435..a243db8012d5f3e2b4525d908a074ab7eba7d112 100644 (file)
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -127,4 +127,5 @@ VENDOR_SECURITY_PATCH := 2020-10-05
 ## Wi-Fi
 BOARD_HOSTAPD_DRIVER := NL80211
 BOARD_WPA_SUPPLICANT_DRIVER := NL80211
+WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true
 WPA_SUPPLICANT_VERSION := VER_0_8_X

diff --git a/extract-files.sh b/extract-files.sh
index c53e26c0857e445d73e4c34a8e26ae2d1f4a0d1e..c91f31d2683bf60bb1c5b25594df9765f09b3f24 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -80,6 +80,9 @@ function blob_fixup() {
         vendor/etc/init/tee-supplicant.rc)
              sed -i s#/vendor/lib/#/vendor/lib/modules/#g "${2}"
              ;;
+        vendor/etc/wifi/wpa_supplicant_overlay.conf)
+             echo "driver_param=use_p2p_group_interface=1">>"${2}"
+             ;;
      esac
  }
 

diff --git a/g12.mk b/g12.mk
index 0dfce6797e3f25740d5737f0f7cb2567d83f08bc..a7ac41c09467a4da5b7c22e6454764ee46ffa2cc 100644 (file)
--- a/g12.mk
+++ b/g12.mk
@@ -110,7 +110,6 @@ PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/init-files/init.amlogic.board.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.board.rc \
     $(COMMON_PATH)/init-files/init.amlogic.media.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.media.rc \
     $(COMMON_PATH)/init-files/init.amlogic.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.usb.rc \
-    $(COMMON_PATH)/init-files/init.amlogic.wifi.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.amlogic.wifi.rc \
     $(COMMON_PATH)/init-files/init.recovery.amlogic.rc:recovery/root/init.recovery.amlogic.rc \
     $(COMMON_PATH)/init-files/ueventd.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc
 

diff --git a/init-files/init.amlogic.wifi.rc b/init-files/init.amlogic.wifi.rc
deleted file mode 100644 (file)
index f0c1a9e..0000000
--- a/init-files/init.amlogic.wifi.rc
+++ /dev/null
@@ -1,13 +0,0 @@
-service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
-    -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1 -dd \
-    -g@android:wpa_wlan0
-
-    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
-    interface android.hardware.wifi.supplicant@1.3::ISupplicant default
-
-    class main
-    socket wpa_wlan0 dgram 660 wifi wifi
-    disabled
-    oneshot