Merge remote-tracking branch 'x86/pie-x86' into q-x86

Conflicts:
	BoardConfig.mk
	nativebridge/bin/enable_nativebridge

diff --combined BoardConfig.mk
index f0b0a57,649c982..c748433
--- 1/BoardConfig.mk
--- 2/BoardConfig.mk
+++ b/BoardConfig.mk
@@@ -11,6 -11,8 +11,6 @@@ BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE
  
  BOARD_USE_LEGACY_UI := true
  
 -BOARD_SYSTEMIMAGE_PARTITION_SIZE = $(if $(MKSQUASHFS),0,1610612736)
 -
  # customize the malloced address to be 16-byte aligned
  BOARD_MALLOC_ALIGNMENT := 16
  
@@@ -90,8 -92,9 +90,15 @@@ BOARD_SEPOLICY_DIRS += device/generic/c
  
  BOARD_PLAT_PRIVATE_SEPOLICY_DIR := device/generic/common/sepolicy/plat_private
  
 +BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
 +BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 33554432
 +BOARD_USES_OEMIMAGE := true
 +BUILD_BROKEN_USES_NETWORK := true
 +USE_XML_AUDIO_POLICY_CONF := 1
++
+ BOARD_USES_MINIGBM := true
+ BOARD_USES_MINIGBM_INTEL := true
+ BOARD_USES_GRALLOC1 := true
+ BOARD_USES_IA_HWCOMPOSER := true
+ TARGET_USES_HWC2 ?= true
+ #BOARD_USES_VULKAN := true

diff --combined init.sh
index 8ecd243,f133f4a..2b0ab95
--- 1/init.sh
--- 2/init.sh
+++ b/init.sh
@@@ -129,6 -129,9 +129,9 @@@ function init_hal_bluetooth(
  function init_hal_camera()
  {
        case "$UEVENT" in
+               *81EK*)
+                       set_prop_if_empty hal.camera.0 0,0
+                       ;;
                *e-tabPro*)
                        set_prop_if_empty hal.camera.0 0,270
                        set_prop_if_empty hal.camera.2 1,90
@@@ -181,15 -184,15 +184,15 @@@ function init_hal_gralloc(
  {
        [ "$VULKAN" = "1" ] && GRALLOC=gbm
  
-       case "$(cat /proc/fb | head -1)" in
-               *virtio*drmfb|*DRM*emulated)
+       case "$(readlink /sys/class/graphics/fb0/device/driver)" in
+               *virtio_gpu)
                        HWC=${HWC:-drm}
                        GRALLOC=${GRALLOC:-gbm}
                        video=${video:-1280x768}
                        ;&
-               0*i915drmfb|0*inteldrmfb|0*radeondrmfb|0*nouveau*|0*svgadrmfb|0*amdgpudrmfb)
+               *i915|*radeon|*nouveau|*vmwgfx|*amdgpu)
                        if [ "$HWACCEL" != "0" ]; then
-                               set_property ro.hardware.hwcomposer ${HWC:-}
+                               ${HWC:+set_property ro.hardware.hwcomposer $HWC}
                                set_property ro.hardware.gralloc ${GRALLOC:-drm}
                                set_drm_mode
                        fi
@@@ -197,27 -200,27 +200,28 @@@
                "")
                        init_uvesafb
                        ;&
-               0*)
+               *)
                        ;;
        esac
  
 +      [ -z "$(getprop ro.hardware.gralloc)" ] && set_property ro.hardware.egl swiftshader
        [ -n "$DEBUG" ] && set_property debug.egl.trace error
  }
  
  function init_hal_hwcomposer()
  {
        # TODO
+       [ "$HWC" = "drmfb" ] && start vendor.hwcomposer-2-1.drmfb
        return
  }
  
  function init_hal_vulkan()
  {
-       case "$(cat /proc/fb | head -1)" in
-               0*i915drmfb|0*inteldrmfb)
+       case "$(readlink /sys/class/graphics/fb0/device/driver)" in
+               *i915)
                        set_property ro.hardware.vulkan android-x86
                        ;;
-               0*amdgpudrmfb)
+               *amdgpu)
                        set_property ro.hardware.vulkan radv
                        ;;
                *)
@@@ -333,7 -336,7 +337,7 @@@ function init_hal_sensors(
                        set_property ro.iio.accel.x.opt_scale -1
                        set_property ro.iio.accel.y.opt_scale -1
                        ;;
-               *SP111-33*)
+               *SP111-33*|*TP300L*)
                        set_property ro.iio.accel.quirks no-trig
                        ;&
                *ST70416-6*)
@@@ -383,7 -386,7 +387,7 @@@ function init_tscal(
                *ST70416-6*)
                        modprobe gslx680_ts_acpi
                        ;&
-               *T91*|*T101*|*ET2002*|*74499FU*|*945GSE-ITE8712*|*CF-19[CDYFGKLP]*|*TECLAST:rntPAD*)
+               *81EK*|*T91**|*T101*|*ET2002*|*74499FU*|*945GSE-ITE8712*|*CF-19[CDYFGKLP]*|*TECLAST:rntPAD*)
                        create_pointercal
                        return
                        ;;
@@@ -549,13 -552,8 +553,13 @@@ for c in `cat /proc/cmdline`; d
                                case $c in
                                        DEBUG=*)
                                                [ -n "$DEBUG" ] && set_property debug.logcat 1
 +                                              [ "$DEBUG" = "0" ] || SETUPWIZARD=${SETUPWIZARD:-0}
 +                                              ;;
 +                                      DPI=*)
 +                                              set_property ro.sf.lcd_density "$DPI"
                                                ;;
                                esac
 +                              [ "$SETUPWIZARD" = "0" ] && set_property ro.setupwizard.mode DISABLED
                        fi
                        ;;
        esac

diff --combined nativebridge/bin/enable_nativebridge
index 5dff00b,34f5a17..00da6f1
--- 1/nativebridge/bin/enable_nativebridge
--- 2/nativebridge/bin/enable_nativebridge
+++ b/nativebridge/bin/enable_nativebridge
@@@ -15,8 -15,7 +15,8 @@@ urls[5]=http://tinyurl.com/y6g6cx2
  
  mount_sfs()
  {
 -      mount -o 'ro,context="u:object_r:system_file:s0"' $1 $2
 +      lodevice=`losetup -r -f -s $1`
-       [ -n "$lodevice" ] && mount -o 'context="u:object_r:system_file:s0"' $lodevice $2
++      [ -n "$lodevice" ] && mount -o 'ro,context="u:object_r:system_file:s0"' $lodevice $2
  }
  
  if [ -z "$1" ]; then

diff --combined treble.mk
index 920ff8d,7989adc..4a719e6
--- 1/treble.mk
--- 2/treble.mk
+++ b/treble.mk
@@@ -5,7 -5,8 +5,8 @@@ PRODUCT_PACKAGES += 
  
  # HWComposer HAL
  PRODUCT_PACKAGES += \
-     android.hardware.graphics.composer@2.1-impl
+     android.hardware.graphics.composer@2.1-impl \
+     android.hardware.graphics.composer@2.1-service.drmfb
  
  # Audio HAL
  PRODUCT_PACKAGES += \
@@@ -25,11 -26,6 +26,11 @@@ PRODUCT_PACKAGES += 
      android.hardware.camera.provider@2.4-impl \
      android.hardware.camera.provider@2.4-service
  
 +# Media codec
 +PRODUCT_PACKAGES += \
 +    android.hardware.media.c2@1.0-service \
 +    android.hardware.media.omx@1.0-service
 +
  # DumpState HAL
  PRODUCT_PACKAGES += \
      android.hardware.dumpstate@1.0-impl \
@@@ -80,12 -76,6 +81,12 @@@ PRODUCT_PACKAGES += 
  PRODUCT_PACKAGES += \
      android.hardware.wifi@1.0-service
  
 +# Drm HAL
 +PRODUCT_PACKAGES += \
 +    android.hardware.drm@1.0-impl \
 +    android.hardware.drm@1.0-service \
 +    android.hardware.drm@1.2-service.clearkey
 +
  # GPS HAL
  PRODUCT_PACKAGES += \
      android.hardware.gnss@1.0-impl \