From 53495d94b265066f764aaa559dcb0230186cbfa1 Mon Sep 17 00:00:00 2001
From: Ziyang Zhou <ziyang.zhou@outlook.com>
Date: Wed, 4 May 2022 22:01:51 +0800
Subject: [PATCH] change to use prebuilts

---
 gpu_config.sh                 | 22 +++++++++++++++++-----
 redroid.mk                    |  5 +----
 redroid_arm64.mk              |  1 +
 redroid_arm64/BoardConfig.mk  |  2 --
 redroid_arm64/device.mk       |  4 ++++
 redroid_x86_64/BoardConfig.mk |  2 --
 redroid_x86_64/device.mk      |  5 +++--
 7 files changed, 26 insertions(+), 15 deletions(-)
 create mode 100644 redroid_arm64/device.mk

diff --git a/gpu_config.sh b/gpu_config.sh
index 306f532..b8eb913 100755
--- a/gpu_config.sh
+++ b/gpu_config.sh
@@ -8,10 +8,19 @@ setup_vulkan() {
             setprop ro.hardware.vulkan intel
             ;;
         amdgpu)
-            setprop ro.hardware.vulkan radv
+            setprop ro.hardware.vulkan radeon
             ;;
         virtio_gpu)
-            # google venus
+            setprop ro.hardware.vulkan virtio
+            ;;
+        v3d|vc4)
+            setprop ro.hardware.vulkan broadcom
+            ;;
+        msm_drm)
+            setprop ro.hardware.vulkan freedreno
+            ;;
+        panfrost)
+            setprop ro.hardware.vulkan panfrost
             ;;
         *)
             echo "not supported driver: $1"
@@ -25,7 +34,7 @@ setup_render_node() {
         echo "force render node: $node"
 
         setprop gralloc.gbm.device $node
-        chmod 0666 $node
+        chmod 666 $node
 
         # setup vulkan
         cd /sys/kernel/debug/dri
@@ -41,11 +50,11 @@ setup_render_node() {
             echo "DRI node exists, driver: $driver"
             setup_vulkan $driver
             case $driver in
-                i915|amdgpu|virtio_gpu)
+                i915|amdgpu|virtio_gpu|v3d|vc4|msm_drm|panfrost)
                     node="/dev/dri/renderD$d"
                     echo "use render node: $node"
                     setprop gralloc.gbm.device $node
-                    chmod 0666 $node
+                    chmod 666 $node
                     return 0
                     ;;
             esac
@@ -94,5 +103,8 @@ gpu_setup() {
     fi
 }
 
+# ?? workaround for ueventd
+chmod 0666 /dev/dri/*
+
 gpu_setup
 
diff --git a/redroid.mk b/redroid.mk
index cbc5f48..bad5f5d 100644
--- a/redroid.mk
+++ b/redroid.mk
@@ -39,8 +39,6 @@ endif
 
 PRODUCT_SHIPPING_API_LEVEL := 29
 
-PRODUCT_SOONG_NAMESPACES += external/mesa3d
-
 AUDIOSERVER_MULTILIB := first
 
 # ?
@@ -60,8 +58,6 @@ PRODUCT_PACKAGES += \
     libGLESv1_CM_swiftshader \
     libGLESv2_swiftshader \
     vulkan.pastel \
-    libGLES_mesa \
-    vulkan.radv \
     ipconfigstore \
 
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -128,3 +124,4 @@ $(call inherit-product, device/redroid/phone-xhdpi-6144-dalvik-heap.mk)
 
 $(call inherit-product-if-exists, product.mk)
 
+$(call inherit-product, device/redroid-prebuilts/prebuilts.mk)
diff --git a/redroid_arm64.mk b/redroid_arm64.mk
index 79aef96..61eb50f 100644
--- a/redroid_arm64.mk
+++ b/redroid_arm64.mk
@@ -16,6 +16,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
 
 $(call inherit-product, $(LOCAL_PATH)/redroid.mk)
+$(call inherit-product, $(LOCAL_PATH)/redroid_arm64/device.mk)
 
 # overrides
 PRODUCT_NAME := redroid_arm64
diff --git a/redroid_arm64/BoardConfig.mk b/redroid_arm64/BoardConfig.mk
index 20014af..de0f1ea 100644
--- a/redroid_arm64/BoardConfig.mk
+++ b/redroid_arm64/BoardConfig.mk
@@ -18,7 +18,5 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE := 16777216
 BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 16777216
 
-BOARD_GPU_DRIVERS := virgl radeonsi
-
 DEVICE_MANIFEST_FILE += device/redroid/manifest.xml
 
diff --git a/redroid_arm64/device.mk b/redroid_arm64/device.mk
new file mode 100644
index 0000000..aac7ddb
--- /dev/null
+++ b/redroid_arm64/device.mk
@@ -0,0 +1,4 @@
+PRODUCT_COPY_FILES += \
+    device/redroid/mediacodec.policy.arm:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \
+
+$(call inherit-product, device/redroid-prebuilts/prebuilts_arm.mk)
diff --git a/redroid_x86_64/BoardConfig.mk b/redroid_x86_64/BoardConfig.mk
index c40478b..ca1ae39 100755
--- a/redroid_x86_64/BoardConfig.mk
+++ b/redroid_x86_64/BoardConfig.mk
@@ -14,7 +14,5 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE := 16777216
 BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 16777216
 
-BOARD_GPU_DRIVERS := i915 i965 r300g r600g virgl iris radeonsi
-
 DEVICE_MANIFEST_FILE += device/redroid/manifest.xml
 
diff --git a/redroid_x86_64/device.mk b/redroid_x86_64/device.mk
index e967bb8..4eb8dca 100644
--- a/redroid_x86_64/device.mk
+++ b/redroid_x86_64/device.mk
@@ -1,3 +1,4 @@
-PRODUCT_PACKAGES += \
-    vulkan.intel \
+PRODUCT_COPY_FILES += \
+    device/redroid/mediacodec.policy.x86:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy \
 
+$(call inherit-product, device/redroid-prebuilts/prebuilts_x86.mk)