From c34753c9133a91ed79c099384e9157da195caad8 Mon Sep 17 00:00:00 2001
From: Yumi Yukimura <me.cafebabe@gmail.com>
Date: Tue, 1 Oct 2024 20:16:00 +0530
Subject: [PATCH] sm6375-common: Switch to QTI Memtrack AIDL HAL

Change-Id: Ibcbaff02fd56fbccc3a88c01a5f46a89cb212ef5
---
 common.mk    | 6 ++----
 manifest.xml | 9 ---------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/common.mk b/common.mk
index 251d844..e43d987 100644
--- a/common.mk
+++ b/common.mk
@@ -166,8 +166,6 @@ PRODUCT_PACKAGES += \
     android.hardware.graphics.common-V1-ndk_platform.vendor \
     android.hardware.graphics.mapper@3.0-impl-qti-display \
     android.hardware.graphics.mapper@4.0-impl-qti-display \
-    android.hardware.memtrack@1.0-impl \
-    android.hardware.memtrack@1.0-service \
     init.qti.display_boot.sh \
     libdisplayconfig.qti \
     libdisplayconfig.system.qti \
@@ -176,7 +174,6 @@ PRODUCT_PACKAGES += \
     libsdmcore \
     libsdmutils \
     libtinyxml \
-    memtrack.default \
     vendor.display.config@1.15.vendor \
     vendor.display.config@2.0 \
     vendor.display.config@2.0.vendor \
@@ -189,7 +186,8 @@ PRODUCT_PACKAGES += \
     vendor.qti.hardware.display.mapperextensions@1.0.vendor \
     vendor.qti.hardware.display.mapperextensions@1.1.vendor \
     vendor.qti.hardware.display.mapperextensions@1.2.vendor \
-    vendor.qti.hardware.display.mapperextensions@1.3.vendor
+    vendor.qti.hardware.display.mapperextensions@1.3.vendor \
+    vendor.qti.hardware.memtrack-service
 
 # DRM
 PRODUCT_PACKAGES += \
diff --git a/manifest.xml b/manifest.xml
index 7680b99..8be8c05 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -73,15 +73,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.memtrack</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IMemtrack</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.nfc</name>
         <transport>hwbinder</transport>