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

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 4ae7068..f7f618b 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -74,7 +74,7 @@ BOARD_WPA_SUPPLICANT_DRIVER ?= NL80211
 WPA_SUPPLICANT_VERSION ?= VER_2_1_DEVEL
 WIFI_DRIVER_MODULE_PATH ?= auto
 
-BOARD_GPU_DRIVERS ?= i915 i965 nouveau r300g r600g radeonsi swrast virgl vmwgfx
+BOARD_GPU_DRIVERS ?= i915 i965 nouveau r300g r600g radeonsi virgl vmwgfx
 ifneq ($(strip $(BOARD_GPU_DRIVERS)),)
 TARGET_HARDWARE_3D := true
 endif

diff --git a/gpu/gpu_mesa.mk b/gpu/gpu_mesa.mk
index ec2bdac..448d95d 100644 (file)
--- a/gpu/gpu_mesa.mk
+++ b/gpu/gpu_mesa.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2011 The Android-x86 Open Source Project
+# Copyright (C) 2011-2017 The Android-x86 Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,5 +15,10 @@ PRODUCT_PACKAGES := \
     libGLES_mesa    \
     libtxc_dxtn     \
 
+PRODUCT_PACKAGES += \
+    libEGL_swiftshader \
+    libGLESv1_CM_swiftshader \
+    libGLESv2_swiftshader \
+
 PRODUCT_PROPERTY_OVERRIDES := \
     ro.opengles.version = 196608

diff --git a/init.sh b/init.sh
index 7e85495..626ab4b 100644 (file)
--- a/init.sh
+++ b/init.sh
@@ -127,20 +127,23 @@ function init_uvesafb()
                        ;;
        esac
 
-       [ "$HWACCEL" = "0" ] && bpp=16 || bpp=32
-       modprobe uvesafb mode_option=${UVESA_MODE:-1024x768}-$bpp ${UVESA_OPTION:-mtrr=3 scroll=redraw}
+       modprobe uvesafb mode_option=${UVESA_MODE:-1024x768}-32 ${UVESA_OPTION:-mtrr=3 scroll=redraw}
 }
 
 function init_hal_gralloc()
 {
        case "$(cat /proc/fb | head -1)" in
                *virtiodrmfb)
-                       set_property ro.hardware.hwcomposer drm
-                       set_property ro.hardware.gralloc gbm
+                       if [ "$HWACCEL" != "0" ]; then
+                               set_property ro.hardware.hwcomposer drm
+                               set_property ro.hardware.gralloc gbm
+                       fi
                        ;;
                0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb|0*amdgpudrmfb)
-                       set_property ro.hardware.gralloc drm
-                       set_drm_mode
+                       if [ "$HWACCEL" != "0" ]; then
+                               set_property ro.hardware.gralloc drm
+                               set_drm_mode
+                       fi
                        ;;
                "")
                        init_uvesafb
@@ -436,9 +439,6 @@ for c in `cat /proc/cmdline`; do
                        eval $c
                        if [ -z "$1" ]; then
                                case $c in
-                                       HWACCEL=*)
-                                               set_property debug.egl.hw $HWACCEL
-                                               ;;
                                        DEBUG=*)
                                                [ -n "$DEBUG" ] && set_property debug.logcat 1
                                                ;;

diff --git a/init.x86.rc b/init.x86.rc
index 9a00eb5..e0b2df9 100644 (file)
--- a/init.x86.rc
+++ b/init.x86.rc
@@ -10,8 +10,6 @@ on early-init
 #   export EGL_DRIVERS egl_dri2
 
 on init
-    symlink /sdcard /mnt/sdcard
-    symlink /sdcard /storage/sdcard0
 
 on fs
     mount_all /fstab.${ro.hardware}
@@ -107,6 +105,3 @@ on property:persist.sys.nativebridge=1
 
 on property:persist.sys.nativebridge=0
     stop nativebridge
-
-on property:debug.egl.hw=0
-    setprop ro.kernel.qemu 1