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

diff --combined init.sh
index ab7f50d,3e5ae24..8293126
--- 1/init.sh
--- 2/init.sh
+++ b/init.sh
@@@ -66,10 -66,13 +66,10 @@@ function init_hal_audio(
                VirtualBox*|Bochs*)
                        [ -d /proc/asound/card0 ] || modprobe snd-sb16 isapnp=0 irq=5
                        ;;
 -              *)
 +              TS10*)
 +                      set_prop_if_empty hal.audio.out pcmC0D2p
                        ;;
        esac
 -
 -      if grep -qi "IntelHDMI" /proc/asound/card0/id; then
 -              [ -d /proc/asound/card1 ] || set_property ro.hardware.audio.primary hdmi
 -      fi
  }
  
  function init_hal_bluetooth()
@@@ -175,19 -178,18 +175,19 @@@ function init_uvesafb(
  
  function init_hal_gralloc()
  {
 +      [ "$VULKAN" = "1" ] && GRALLOC=gbm
 +
        case "$(cat /proc/fb | head -1)" in
                *virtiodrmfb)
                        if [ "$HWACCEL" != "0" ]; then
 -                              set_property ro.hardware.hwcomposer drm
 -                              set_property ro.hardware.gralloc gbm
 +                              set_property ro.hardware.hwcomposer ${HWC:-drm}
 +                              set_property ro.hardware.gralloc ${GRALLOC:-gbm}
                                set_property debug.drm.mode.force ${video:-1280x800}
                        fi
 -                      set_prop_if_empty sleep.state none
                        ;;
                0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb|0*amdgpudrmfb)
                        if [ "$HWACCEL" != "0" ]; then
 -                              set_property ro.hardware.gralloc drm
 +                              set_property ro.hardware.gralloc ${GRALLOC:-drm}
                                set_drm_mode
                        fi
                        ;;
@@@ -207,20 -209,6 +207,20 @@@ function init_hal_hwcomposer(
        return
  }
  
 +function init_hal_vulkan()
 +{
 +      case "$(cat /proc/fb | head -1)" in
 +              0*inteldrmfb)
 +                      set_property ro.hardware.vulkan android-x86
 +                      ;;
 +              0*amdgpudrmfb)
 +                      set_property ro.hardware.vulkan radv
 +                      ;;
 +              *)
 +                      ;;
 +      esac
 +}
 +
  function init_hal_lights()
  {
        chown 1000.1000 /sys/class/backlight/*/brightness
@@@ -234,7 -222,7 +234,7 @@@ function init_hal_power(
  
        # TODO
        case "$PRODUCT" in
 -              HP*Omni*|OEMB|Surface*3|T10*TA)
 +              HP*Omni*|OEMB|Standard*PC*|Surface*3|T10*TA|VMware*)
                        set_prop_if_empty sleep.state none
                        ;;
                e-tab*Pro)
@@@ -321,6 -309,9 +321,9 @@@ function init_hal_sensors(
                        set_property ro.iio.accel.x.opt_scale -1
                        set_property ro.iio.accel.y.opt_scale -1
                        ;;
+               *SP111-33*)
+                       set_property ro.iio.accel.quirks no-trig
+                       ;&
                *ST70416-6*)
                        set_property ro.iio.accel.order 102
                        ;;
@@@ -422,7 -413,6 +425,7 @@@ function do_init(
        init_hal_gps
        init_hal_gralloc
        init_hal_hwcomposer
 +      init_hal_vulkan
        init_hal_lights
        init_hal_power
        init_hal_sensors
@@@ -481,9 -471,6 +484,9 @@@ function do_bootcomplete(
                Surface*Go)
                        echo on > /sys/devices/pci0000:00/0000:00:15.1/i2c_designware.1/power/control
                        ;;
 +              VMware*)
 +                      pm disable com.android.bluetooth
 +                      ;;
                X80*Power)
                        set_property power.nonboot-cpu-off 1
                        ;;