From 36615e9d9f51b1efe1fd39af8ce4f5a1fc679a20 Mon Sep 17 00:00:00 2001
From: Tim Zimmermann <tim@linux4.de>
Date: Fri, 9 Sep 2022 15:24:33 +0200
Subject: [PATCH] universal7885: Switch to new AIDL memtrack HAL

Change-Id: I3ae077b5f59e4fcf32489eef64bce8551d758998
---
 universal7885-common/configs/vintf/manifest.xml     | 5 -----
 universal7885-common/sepolicy/vendor/genfs_contexts | 3 +++
 universal7885-common/universal7885-common.mk        | 3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/universal7885-common/configs/vintf/manifest.xml b/universal7885-common/configs/vintf/manifest.xml
index 4c0888b..49307b8 100644
--- a/universal7885-common/configs/vintf/manifest.xml
+++ b/universal7885-common/configs/vintf/manifest.xml
@@ -69,11 +69,6 @@
       <fqname>@1.0::IOmx/default</fqname>
       <fqname>@1.0::IOmxStore/default</fqname>
    </hal>
-   <hal format="hidl">
-      <name>android.hardware.memtrack</name>
-      <transport>hwbinder</transport>
-      <fqname>@1.0::IMemtrack/default</fqname>
-   </hal>
    <hal format="hidl">
       <name>android.hardware.sensors</name>
       <transport>hwbinder</transport>
diff --git a/universal7885-common/sepolicy/vendor/genfs_contexts b/universal7885-common/sepolicy/vendor/genfs_contexts
index c47a248..4b5ae18 100644
--- a/universal7885-common/sepolicy/vendor/genfs_contexts
+++ b/universal7885-common/sepolicy/vendor/genfs_contexts
@@ -185,3 +185,6 @@ genfscon sysfs /kernel/gpu/
 genfscon sysfs /kernel/gpu/gpu_max_clock                                          u:object_r:sysfs_gpu_writable:s0
 genfscon sysfs /kernel/gpu/gpu_min_clock                                          u:object_r:sysfs_gpu_writable:s0
 
+genfscon sysfs /devices/platform/11500000.mali/dma_buf_gpu_mem                    u:object_r:sysfs_gpu:s0
+genfscon sysfs /devices/platform/11500000.mali/kprcs                              u:object_r:sysfs_gpu:s0
+genfscon sysfs /devices/platform/11500000.mali/total_gpu_mem                      u:object_r:sysfs_gpu:s0
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index 36a8638..63099c1 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -185,8 +185,7 @@ PRODUCT_COPY_FILES += \
 
 # Memtrack
 PRODUCT_PACKAGES += \
-    android.hardware.memtrack@1.0-impl \
-    android.hardware.memtrack@1.0-service
+    android.hardware.memtrack-service.samsung-mali
 
 # NFC
 PRODUCT_PACKAGES += \