From 5a4fd4769b2d816dbaa7c2333c734abc16e2263a Mon Sep 17 00:00:00 2001
From: Yumi Yukimura <me.cafebabe@gmail.com>
Date: Tue, 13 Feb 2024 11:23:49 +0800
Subject: [PATCH] sdm710-common: Build QTI Thermal 2.0 HAL

Revert 699b06a
Change-Id: Iae471a16a0284cd24a598bac1a3ea0736faceb9f
---
 rootdir/etc/init.qcom.rc | 10 ----------
 sdm710.mk                |  5 ++++-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 7e478a6..f8224da 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -1042,16 +1042,6 @@ service vendor.audio-hal /vendor/bin/hw/android.hardware.audio.service
     socket audio_hw_socket seqpacket 0666 system system
     onrestart restart audioserver
 
-service vendor.thermal-hal-2-0 /vendor/bin/hw/android.hardware.thermal@2.0-service.pixel
-    override
-    interface android.hardware.thermal@1.0::IThermal default
-    interface android.hardware.thermal@2.0::IThermal default
-    class hal
-    user system
-    group system
-    priority -20
-    disabled
-
 on property:sys.boot_completed=1
     # Restrict permissions to socket file
     # to hide Magisk & co.
diff --git a/sdm710.mk b/sdm710.mk
index 84c7fee..31edc91 100644
--- a/sdm710.mk
+++ b/sdm710.mk
@@ -469,7 +469,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     TetheringConfigOverlay
 
-# Thermal engine
+# Thermal
+PRODUCT_PACKAGES += \
+    android.hardware.thermal@2.0-service.qti
+    
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/thermal-engine.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine.conf