thermal: use common device.mk
Bug: 146390555
Test: run pts thermal-hal and themal-engine via forrest
Change-Id: I639601456ee48000e3e3de339fa560c1f2d4a676
diff --git a/device.mk b/device.mk
index 55ef89b..4bce847 100644
--- a/device.mk
+++ b/device.mk
@@ -502,15 +502,6 @@
ro.vibrator.hal.long.frequency.shift=10 \
ro.vibrator.hal.steady.shape=1
-# Thermal HAL
-PRODUCT_PACKAGES += \
- android.hardware.thermal@2.0-service.pixel \
-
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES += \
- thermal_logd
-endif
-
# Thermal HAL config
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/thermal_info_config_$(PRODUCT_HARDWARE).json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \
@@ -897,3 +888,6 @@
# mm_event
-include hardware/google/pixel/mm/device_legacy.mk
+
+# thermal
+-include hardware/google/pixel/thermal/device.mk
diff --git a/init.hardware.rc b/init.hardware.rc
index 9eba315..9a0f4a9 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -128,7 +128,6 @@
chown system system /sys/devices/platform/soc/soc:google,charger/charge_start_level
on late-init
- setprop vendor.thermal.config thermal_info_config.json
chown system system /sys/devices/virtual/thermal/tz-by-name/skin-therm-monitor/trip_point_0_temp
chown system system /sys/devices/virtual/thermal/tz-by-name/skin-therm-monitor/trip_point_0_hyst
chown system system /sys/devices/virtual/thermal/tz-by-name/usbc-therm-monitor/trip_point_0_temp
