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

diff --combined init.sh
index 867ae57,2acd918..812e055
--- 1/init.sh
--- 2/init.sh
+++ b/init.sh
@@@ -38,10 -38,13 +38,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()
@@@ -100,7 -103,14 +100,14 @@@
  
  function init_hal_camera()
  {
-       return
+       case "$PRODUCT" in
+               e-tab*Pro)
+                       set_prop_if_empty hal.camera.0 0,270
+                       set_prop_if_empty hal.camera.2 1,90
+                       ;;
+               *)
+                       ;;
+       esac
  }
  
  function init_hal_gps()
@@@ -140,19 -150,18 +147,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
                        ;;
@@@ -172,20 -181,6 +179,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
@@@ -199,7 -194,7 +206,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)
@@@ -387,7 -382,6 +394,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
@@@ -446,9 -440,6 +453,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
 +                      ;;
                *)
                        ;;
        esac