From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Mon, 5 Mar 2018 04:03:06 +0000 (+0800)
Subject: Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
X-Git-Tag: android-x86-8.1-r1~38
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=commitdiff_plain;h=2cae43df47994631a340f415523f66f40be10733;hp=-c

Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
---

2cae43df47994631a340f415523f66f40be10733
diff --combined init.x86.rc
index 0b54bd0,d71d272..e0fe113
--- a/init.x86.rc
+++ b/init.x86.rc
@@@ -45,9 -45,8 +45,9 @@@ on boo
      # workaround for h.265 slowness
      setprop sys.media.vdec.drop 0
  
 -service wpa_supplicant /system/bin/wpa_supplicant -c/data/misc/wifi/wpa_supplicant.conf \
 -    -iwlan0 -Dnl80211 \
 +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
      #   we will start as root and wpa_supplicant will switch to user wifi
@@@ -57,14 -56,13 +57,14 @@@
      class main
      socket wpa_wlan0 dgram 660 wifi wifi
      disabled
 +    oneshot
  
  service nativebridge /system/bin/enable_nativebridge
      class main
      disabled
      oneshot
  
- service logcat /system/bin/logcat -v threadtime -f /data/log.txt
+ service logcat /system/bin/logcat -b all -v threadtime -f /data/log.txt
      class debug
  
  service btattach /system/bin/btattach
diff --combined packages.mk
index 665a344,6bae5ef..a1e102b
--- a/packages.mk
+++ b/packages.mk
@@@ -64,7 -64,6 +64,7 @@@ PRODUCT_PACKAGES := 
  PRODUCT_PACKAGES += \
      libwpa_client \
      hostapd \
 +    wificond \
      wpa_supplicant \
      wpa_supplicant.conf \
  
@@@ -98,3 -97,4 +98,4 @@@ PRODUCT_PACKAGES += 
  # Third party apps
  PRODUCT_PACKAGES += \
      Eleven \
+     TSCalibration2 \