| Revisión | 6b6de523f06f897e51edf4ad3b41e6daacd096a0 (tree) |
|---|---|
| Tiempo | 2019-03-20 19:26:08 |
| Autor | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Fix wifi support of pie-x86
Update to supplicant 1.1.
CleanSpec.mk (diff) device.mk (diff) init.x86.rc (diff) manifest.xml (diff)| @@ -3,3 +3,4 @@ $(call add-clean-step, rm -rf $(TARGET_OUT_APPS_PRIVILEGED)/Telecom) | ||
| 3 | 3 | $(call add-clean-step, rm -f $(TARGET_OUT_VENDOR)/*/*/android.hardware.bluetooth@1.0-service* $(TARGET_OUT)/lib*/libbt-vendor.so) |
| 4 | 4 | $(call add-clean-step, rm -f $(TARGET_OUT_VENDOR)/lib*/hw/android.hardware.bluetooth@1.0-impl.so) |
| 5 | 5 | $(call add-clean-step, rm -rf $(TARGET_OUT_APPS)/AndroidTerm) |
| 6 | +$(call add-clean-step, rm -rf $(TARGET_OUT_ETC)/wifi) |
| @@ -34,8 +34,8 @@ PRODUCT_COPY_FILES := \ | ||
| 34 | 34 | $(if $(wildcard $(PRODUCT_DIR)init.sh),$(PRODUCT_DIR),$(LOCAL_PATH)/)init.sh:system/etc/init.sh \ |
| 35 | 35 | $(if $(wildcard $(PRODUCT_DIR)modules.blacklist),$(PRODUCT_DIR),$(LOCAL_PATH)/)modules.blacklist:system/etc/modules.blacklist \ |
| 36 | 36 | $(if $(wildcard $(PRODUCT_DIR)fstab.$(TARGET_PRODUCT)),$(PRODUCT_DIR)fstab.$(TARGET_PRODUCT),$(LOCAL_PATH)/fstab.x86):root/fstab.$(TARGET_PRODUCT) \ |
| 37 | - $(if $(wildcard $(PRODUCT_DIR)wpa_supplicant.conf),$(PRODUCT_DIR),$(LOCAL_PATH)/)wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf \ | |
| 38 | - $(if $(wildcard $(PRODUCT_DIR)wpa_supplicant_overlay.conf),$(PRODUCT_DIR),$(LOCAL_PATH)/)wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \ | |
| 37 | + $(if $(wildcard $(PRODUCT_DIR)wpa_supplicant.conf),$(PRODUCT_DIR),$(LOCAL_PATH)/)wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf \ | |
| 38 | + $(if $(wildcard $(PRODUCT_DIR)wpa_supplicant_overlay.conf),$(PRODUCT_DIR),$(LOCAL_PATH)/)wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \ | |
| 39 | 39 | $(if $(wildcard $(PRODUCT_DIR)excluded-input-devices.xml),$(PRODUCT_DIR),$(LOCAL_PATH)/)excluded-input-devices.xml:system/etc/excluded-input-devices.xml \ |
| 40 | 40 | $(if $(wildcard $(PRODUCT_DIR)init.$(TARGET_PRODUCT).rc),$(PRODUCT_DIR)init.$(TARGET_PRODUCT).rc,$(LOCAL_PATH)/init.x86.rc):root/init.$(TARGET_PRODUCT).rc \ |
| 41 | 41 | $(if $(wildcard $(PRODUCT_DIR)ueventd.$(TARGET_PRODUCT).rc),$(PRODUCT_DIR)ueventd.$(TARGET_PRODUCT).rc,$(LOCAL_PATH)/ueventd.x86.rc):root/ueventd.$(TARGET_PRODUCT).rc \ |
| @@ -18,10 +18,12 @@ on post-fs | ||
| 18 | 18 | exec u:r:init:s0 -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh |
| 19 | 19 | |
| 20 | 20 | on post-fs-data |
| 21 | - mkdir /data/misc/wifi 0770 wifi wifi | |
| 22 | - mkdir /data/misc/wifi/sockets 0770 wifi wifi | |
| 23 | - mkdir /data/misc/wifi/wpa_supplicant 0770 wifi wifi | |
| 21 | + # Create the directories used by the Wireless subsystem | |
| 22 | + mkdir /data/vendor/wifi 0771 wifi wifi | |
| 23 | + mkdir /data/vendor/wifi/wpa 0770 wifi wifi | |
| 24 | + mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi | |
| 24 | 25 | mkdir /data/misc/dhcp 0770 dhcp dhcp |
| 26 | + | |
| 25 | 27 | mkdir /data/system 0775 system system |
| 26 | 28 | |
| 27 | 29 | # Set indication (checked by vold) that we have finished this action |
| @@ -46,14 +48,14 @@ on boot | ||
| 46 | 48 | setprop sys.media.vdec.drop 0 |
| 47 | 49 | |
| 48 | 50 | service wpa_supplicant /vendor/bin/hw/wpa_supplicant -dd \ |
| 49 | - -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \ | |
| 50 | - -I/system/etc/wifi/wpa_supplicant_overlay.conf \ | |
| 51 | - -O/data/misc/wifi/sockets \ | |
| 52 | - -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0 | |
| 51 | + -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1 \ | |
| 52 | + -g@android:wpa_wlan0 | |
| 53 | 53 | # we will start as root and wpa_supplicant will switch to user wifi |
| 54 | 54 | # after setting up the capabilities required for WEXT |
| 55 | 55 | # user wifi |
| 56 | 56 | # group wifi inet keystore |
| 57 | + interface android.hardware.wifi.supplicant@1.0::ISupplicant default | |
| 58 | + interface android.hardware.wifi.supplicant@1.1::ISupplicant default | |
| 57 | 59 | class main |
| 58 | 60 | socket wpa_wlan0 dgram 660 wifi wifi |
| 59 | 61 | disabled |
| @@ -141,7 +141,7 @@ | ||
| 141 | 141 | <hal format="hidl"> |
| 142 | 142 | <name>android.hardware.wifi.supplicant</name> |
| 143 | 143 | <transport>hwbinder</transport> |
| 144 | - <version>1.0</version> | |
| 144 | + <version>1.1</version> | |
| 145 | 145 | <interface> |
| 146 | 146 | <name>ISupplicant</name> |
| 147 | 147 | <instance>default</instance> |
Android-x86
Fork