From: Chih-Wei Huang Date: Sat, 23 Nov 2019 07:42:45 +0000 (+0800) Subject: Merge remote-tracking branch 'x86/oreo-x86' into pie-x86 X-Git-Tag: android-x86-9.0-r1~3 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=64563a1e63b0ae2362c91e5f5782b6169a4ddfd6;hp=716763cb9de32629e7b5968316828e6107577a9b;p=android-x86%2Fdevice-generic-common.git Merge remote-tracking branch 'x86/oreo-x86' into pie-x86 --- diff --git a/CleanSpec.mk b/CleanSpec.mk index c04c745..f36db33 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -3,3 +3,4 @@ $(call add-clean-step, rm -rf $(TARGET_OUT_APPS_PRIVILEGED)/Telecom) $(call add-clean-step, rm -f $(TARGET_OUT_VENDOR)/*/*/android.hardware.bluetooth@1.0-service* $(TARGET_OUT)/lib*/libbt-vendor.so) $(call add-clean-step, rm -f $(TARGET_OUT_VENDOR)/lib*/hw/android.hardware.bluetooth@1.0-impl.so) $(call add-clean-step, rm -rf $(TARGET_OUT_APPS)/AndroidTerm) +$(call add-clean-step, rm -rf $(TARGET_OUT_ETC)/wifi) diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk index ee6dbfc..f09d51c 100644 --- a/build/tasks/kernel.mk +++ b/build/tasks/kernel.mk @@ -8,9 +8,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 # -export LC_CTYPE := C -export LC_MESSAGES := C - ifneq ($(TARGET_NO_KERNEL),true) ifeq ($(TARGET_PREBUILT_KERNEL),) @@ -61,7 +58,7 @@ KERNEL_DOTCONFIG_FILE := $(KBUILD_OUTPUT)/.config KERNEL_ARCH_CHANGED := $(if $(filter 0,$(shell grep -s ^$(if $(filter x86,$(TARGET_KERNEL_ARCH)),\#.)CONFIG_64BIT $(KERNEL_DOTCONFIG_FILE) | wc -l)),FORCE) $(KERNEL_DOTCONFIG_FILE): $(KERNEL_CONFIG_FILE) $(wildcard $(TARGET_KERNEL_DIFFCONFIG)) $(KERNEL_ARCH_CHANGED) $(hide) mkdir -p $(@D) && cat $(wildcard $^) > $@ - $(hide) ln -sf ../../../../../../external $(@D) + $(hide) ln -sf ../../../../../../prebuilts $(@D) $(mk_kernel) olddefconfig BUILT_KERNEL_TARGET := $(KBUILD_OUTPUT)/arch/$(TARGET_ARCH)/boot/$(KERNEL_TARGET) diff --git a/device.mk b/device.mk index 55c03d0..d9644da 100644 --- a/device.mk +++ b/device.mk @@ -34,8 +34,8 @@ PRODUCT_COPY_FILES := \ $(if $(wildcard $(PRODUCT_DIR)init.sh),$(PRODUCT_DIR),$(LOCAL_PATH)/)init.sh:system/etc/init.sh \ $(if $(wildcard $(PRODUCT_DIR)modules.blacklist),$(PRODUCT_DIR),$(LOCAL_PATH)/)modules.blacklist:system/etc/modules.blacklist \ $(if $(wildcard $(PRODUCT_DIR)fstab.$(TARGET_PRODUCT)),$(PRODUCT_DIR)fstab.$(TARGET_PRODUCT),$(LOCAL_PATH)/fstab.x86):root/fstab.$(TARGET_PRODUCT) \ - $(if $(wildcard $(PRODUCT_DIR)wpa_supplicant.conf),$(PRODUCT_DIR),$(LOCAL_PATH)/)wpa_supplicant.conf:system/etc/wifi/wpa_supplicant.conf \ - $(if $(wildcard $(PRODUCT_DIR)wpa_supplicant_overlay.conf),$(PRODUCT_DIR),$(LOCAL_PATH)/)wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf \ + $(if $(wildcard $(PRODUCT_DIR)wpa_supplicant.conf),$(PRODUCT_DIR),$(LOCAL_PATH)/)wpa_supplicant.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant.conf \ + $(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 \ $(if $(wildcard $(PRODUCT_DIR)excluded-input-devices.xml),$(PRODUCT_DIR),$(LOCAL_PATH)/)excluded-input-devices.xml:system/etc/excluded-input-devices.xml \ $(if $(wildcard $(PRODUCT_DIR)init.$(TARGET_PRODUCT).rc),$(PRODUCT_DIR)init.$(TARGET_PRODUCT).rc,$(LOCAL_PATH)/init.x86.rc):root/init.$(TARGET_PRODUCT).rc \ $(if $(wildcard $(PRODUCT_DIR)ueventd.$(TARGET_PRODUCT).rc),$(PRODUCT_DIR)ueventd.$(TARGET_PRODUCT).rc,$(LOCAL_PATH)/ueventd.x86.rc):root/ueventd.$(TARGET_PRODUCT).rc \ @@ -50,7 +50,6 @@ PRODUCT_COPY_FILES += \ device/sample/etc/old-apns-conf.xml:system/etc/old-apns-conf.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ - frameworks/base/config/compiled-classes-phone:system/etc/compiled-classes \ frameworks/native/data/etc/tablet_core_hardware.xml:system/etc/permissions/tablet_core_hardware.xml \ frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \ frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \ diff --git a/init.x86.rc b/init.x86.rc index bdb05e2..b36a722 100644 --- a/init.x86.rc +++ b/init.x86.rc @@ -18,10 +18,12 @@ on post-fs exec u:r:init:s0 -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh on post-fs-data - mkdir /data/misc/wifi 0770 wifi wifi - mkdir /data/misc/wifi/sockets 0770 wifi wifi - mkdir /data/misc/wifi/wpa_supplicant 0770 wifi wifi + # Create the directories used by the Wireless subsystem + mkdir /data/vendor/wifi 0771 wifi wifi + mkdir /data/vendor/wifi/wpa 0770 wifi wifi + mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi mkdir /data/misc/dhcp 0770 dhcp dhcp + mkdir /data/system 0775 system system chown wifi wifi /data/misc/wifi/wpa_supplicant.conf @@ -47,14 +49,14 @@ on boot setprop sys.media.vdec.drop 0 service wpa_supplicant /vendor/bin/hw/wpa_supplicant -dd \ - -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \ - -I/system/etc/wifi/wpa_supplicant_overlay.conf \ - -O/data/misc/wifi/sockets \ - -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0 + -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 class main socket wpa_wlan0 dgram 660 wifi wifi disabled diff --git a/manifest.xml b/manifest.xml index 596ef18..df199d5 100644 --- a/manifest.xml +++ b/manifest.xml @@ -141,7 +141,7 @@ android.hardware.wifi.supplicant hwbinder - 1.0 + 1.1 ISupplicant default diff --git a/nativebridge/bin/enable_nativebridge b/nativebridge/bin/enable_nativebridge index 9802809..44327e7 100644 --- a/nativebridge/bin/enable_nativebridge +++ b/nativebridge/bin/enable_nativebridge @@ -6,12 +6,12 @@ houdini_bin=0 dest_dir=/system/lib$1/arm$1 binfmt_misc_dir=/proc/sys/fs/binfmt_misc -urls[0]=http://t.cn/RBJ7mfG -urls[1]=http://t.cn/RBJ7eml -urls[2]=http://t.cn/RBJzLwu -urls[3]=http://goo.gl/96BPKe -urls[4]=http://goo.gl/v6c4Co -urls[5]=http://goo.gl/CtKjxx +urls[0]=http://t.cn/EJrmzZv +urls[1]=http://t.cn/EJrmYMH +urls[2]=http://t.cn/EJrmrA7 +urls[3]=http://tinyurl.com/y3nagyza +urls[4]=http://tinyurl.com/y6azmjas +urls[5]=http://tinyurl.com/y6g6cx27 mount_sfs() { @@ -19,10 +19,10 @@ mount_sfs() } if [ -z "$1" ]; then - v=8_y + v=9_y u=1 else - v=8_z + v=9_z u=2 fi