From e4c8878640dca68a39e083fd98dddeb1b618de20 Mon Sep 17 00:00:00 2001
From: oxmc <67136658+oxmc@users.noreply.github.com>
Date: Tue, 4 Nov 2025 15:57:48 -0800
Subject: [PATCH] Fix camera file name, switch vulkan to apex, same as upstream

---
 ...android.hardware.camera.provider-V1-external-service.rc} | 0
 device.mk                                                | 9 +++++----
 sepolicy/file_contexts                                   | 9 ++++-----
 vendor.prop                                              | 5 -----
 4 files changed, 9 insertions(+), 14 deletions(-)
 rename camera/external/{android.hardware.camera.provider-V1-external-service.rc‎ => android.hardware.camera.provider-V1-external-service.rc} (100%)

diff --git a/camera/external/android.hardware.camera.provider-V1-external-service.rc‎ b/camera/external/android.hardware.camera.provider-V1-external-service.rc
similarity index 100%
rename from camera/external/android.hardware.camera.provider-V1-external-service.rc‎
rename to camera/external/android.hardware.camera.provider-V1-external-service.rc
diff --git a/device.mk b/device.mk
index f8c0c9e..e3a545e 100644
--- a/device.mk
+++ b/device.mk
@@ -128,15 +128,16 @@ PRODUCT_PACKAGES += \
     libgallium_dri
 
 PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.software.opengles.deqp.level-2024-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml
+    frameworks/native/data/etc/android.software.opengles.deqp.level-latest.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml
 
 PRODUCT_PACKAGES += \
-    vulkan.broadcom
+    com.android.hardware.vulkan.broadcom
 
 PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.vulkan.level-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \
+    frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute.xml \
+    frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \
     frameworks/native/data/etc/android.hardware.vulkan.version-1_3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \
-    frameworks/native/data/etc/android.software.vulkan.deqp.level-2024-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml
+    frameworks/native/data/etc/android.software.vulkan.deqp.level-latest.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml
 
 # Health
 PRODUCT_PACKAGES += \
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 854ce97..becf408 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -6,11 +6,10 @@
 /data/vendor/mediadrm(/.*)?  u:object_r:mediadrm_vendor_data_file:s0
 
 # Graphics
-/dev/dri(/.*)?                         u:object_r:gpu_device:s0
-/vendor/lib64/hw/vulkan\.broadcom\.so  u:object_r:same_process_hal_file:s0
-/vendor/lib64/libdrm\.so               u:object_r:same_process_hal_file:s0
-/vendor/lib64/libgallium_dri\.so       u:object_r:same_process_hal_file:s0
-/vendor/lib64/libui\.so                u:object_r:same_process_hal_file:s0
+/dev/dri(/.*)?                    u:object_r:gpu_device:s0
+/vendor/lib64/libdrm\.so          u:object_r:same_process_hal_file:s0
+/vendor/lib64/libgallium_dri\.so  u:object_r:same_process_hal_file:s0
+/vendor/lib64/libui\.so           u:object_r:same_process_hal_file:s0
 
 # Partitions
 /dev/block/mmcblk0p1  u:object_r:boot_block_device:s0
diff --git a/vendor.prop b/vendor.prop
index 53dcd60..45381e2 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -34,9 +34,6 @@ bluetooth.profile.sap.server.enabled?=true
 bluetooth.profile.vcp.controller.enabled?=true
 persist.bluetooth.a2dp_aac.vbr_supported=true
 
-# Camera
-ro.hardware.camera=libcamera
-
 # CEC
 persist.vendor.hdmi.cec_device=cec0
 ro.hdmi.cec_device_types=playback_device
@@ -56,9 +53,7 @@ persist.vendor.ffmpeg_codec2.v4l2.h265=true
 
 # Graphics
 ro.hardware.egl=mesa
-ro.hardware.vulkan=broadcom
 ro.opengles.version=196609
-vendor.hwc.backend_override=rpi5
 vendor.hwc.drm.ctm=DRM_OR_IGNORE
 vendor.hwc.drm.disable_hdr=1