commit 3eaaa65da01ecc8faa2dccdf0b0e1dcd4046978d
author mandyshen <mandyshen@google.com> Thu Mar 26 01:47:08 2020 +0800
committer mandyshen <mandyshen@google.com> Mon Apr 06 21:39:39 2020 +0800
tree 58bd2cddf729626d401c720152a0f3c57de92817
parent 6dccb025ad67709d40efdb59e5e5f64c5a8b4907

thermal: use common device.mk

Bug: 146390555
Test: run pts thermal-hal and themal-engine via forrest
Change-Id: Id3340136b76f6f08e5ccce4abf44bf20d102f48b

device.mk

diff --git a/device.mk b/device.mk
index fc5f8a7..7d7a02f 100644
--- a/device.mk
+++ b/device.mk
@@ -505,15 +505,6 @@
     android.hardware.boot@1.0-impl.recovery \
     android.hardware.boot@1.0-service \
 
-# Thermal HAL
-PRODUCT_PACKAGES += \
-    android.hardware.thermal@2.0-service.pixel
-
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PACKAGES += \
-    thermal_logd
-endif
-
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/thermal_info_config_$(PRODUCT_HARDWARE).json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json
 
@@ -902,3 +893,4 @@
 include hardware/google/pixel/vibrator/drv2624/device.mk
 include hardware/google/pixel/pixelstats/device.mk
 include hardware/google/pixel/mm/device_legacy.mk
+include hardware/google/pixel/thermal/device.mk

init.hardware.rc

diff --git a/init.hardware.rc b/init.hardware.rc
index 0eb7448..4058693 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -147,7 +147,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/mb-therm-monitor/trip_point_0_temp
     chown system system /sys/devices/virtual/thermal/tz-by-name/mb-therm-monitor/trip_point_0_hyst
     chown system system /sys/devices/virtual/thermal/tz-by-name/usbc-therm-monitor/trip_point_0_temp