From c07ed795e10b1a6c120d22e39fab97d53ee014c7 Mon Sep 17 00:00:00 2001
From: Yumi Yukimura <me.cafebabe@gmail.com>
Date: Thu, 16 Jan 2025 03:55:38 +0800
Subject: [PATCH] virtio-common: Use ranchu hwcomposer AIDL HAL APEX by default

* Gives better Android support on virtio-gpu

Change-Id: I99670b2f2671e92b2d093845d5969a9453ed8ba0
---

diff --git a/configs/init/init.virtio.rc b/configs/init/init.virtio.rc
index 5b6f554..f1d75ea 100644
--- a/configs/init/init.virtio.rc
+++ b/configs/init/init.virtio.rc
@@ -39,13 +39,9 @@
 
 # Graphics (Mesa)
 on property:ro.vendor.graphics=mesa
-    setprop ro.hardware.gralloc minigbm
     setprop ro.hardware.vulkan virtio
     setprop ro.opengles.version 196610
 
-on property:ro.vendor.graphics=mesa_swrast
-    setprop ro.hardware.gralloc minigbm
-
 # Serial logging
 service seriallogging /system/bin/logcat -b all -v threadtime -f /dev/hvc1 *:V
     class main
diff --git a/configs/properties/vendor.prop b/configs/properties/vendor.prop
index 164a605..f0bc5aa 100644
--- a/configs/properties/vendor.prop
+++ b/configs/properties/vendor.prop
@@ -1,5 +1,13 @@
 # Display
 debug.sf.vsync_reactor_ignore_present_fences=true
 
+# Graphics (Composer)
+ro.vendor.hwcomposer.display_finder_mode=drm
+ro.vendor.hwcomposer.mode=client
+ro.vendor.hwcomposer.pmem=/mnt/vendor/persist/ranchu-hwc3.json
+
+# Graphics (Gralloc)
+ro.hardware.gralloc=minigbm
+
 # Recovery
 ro.recovery.supported_fs=9p,virtiofs
diff --git a/device-common.mk b/device-common.mk
index 06643ad..66efd78 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -10,8 +10,13 @@
 COMMON_PATH := device/virt/virtio-common
 
 # Graphics (Composer)
+ifeq ($(TARGET_HWCOMPOSER_USE),drm)
 PRODUCT_PACKAGES += \
     android.hardware.composer.hwc3-service.drm
+else
+PRODUCT_PACKAGES += \
+    com.android.hardware.graphics.composer.ranchu
+endif
 
 # Graphics (Gralloc)
 PRODUCT_PACKAGES += \
@@ -56,6 +61,7 @@
 
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
+    device/generic/goldfish-opengl \
     $(COMMON_PATH)
 
 # Vendor ramdisk
diff --git a/sepolicy/vendor/hal_graphics_composer_default.te b/sepolicy/vendor/hal_graphics_composer_default.te
new file mode 100644
index 0000000..7198ca1
--- /dev/null
+++ b/sepolicy/vendor/hal_graphics_composer_default.te
@@ -0,0 +1,3 @@
+allow hal_graphics_composer_default mnt_vendor_file:dir search;
+allow hal_graphics_composer_default persist_file:dir rw_dir_perms;
+allow hal_graphics_composer_default persist_file:file create_file_perms;
diff --git a/sepolicy/vendor/vendor_init.te b/sepolicy/vendor/vendor_init.te
new file mode 100644
index 0000000..b54eefd
--- /dev/null
+++ b/sepolicy/vendor/vendor_init.te
@@ -0,0 +1 @@
+set_prop(vendor_init, vendor_hwcomposer_prop)