Merge "Revert "caimito: powerhint: Use the same hints as zuma for baseline."" into main

conf/init.caiman.rc

@@ -4,9 +4,6 @@ import /vendor/etc/init/hw/init.zumapro.rc
 on init && property:ro.vendor.factory=1
     import /vendor/etc/init/hw/init.factory.rc
 
-on init && property:ro.boot.hardware.platform=zuma
-    setprop vendor.powerhal.config powerhint-proto.json
-
 on init
     # eSE  streset tool name
     setprop persist.vendor.se.streset libstreset24

conf/init.komodo.rc

@@ -4,9 +4,6 @@ import /vendor/etc/init/hw/init.zumapro.rc
 on init && property:ro.vendor.factory=1
     import /vendor/etc/init/hw/init.factory.rc
 
-on init && property:ro.boot.hardware.platform=zuma
-    setprop vendor.powerhal.config powerhint-proto.json
-
 on init
     # eSE streset tool name
     setprop persist.vendor.se.streset libstreset24

conf/init.tokay.rc

@@ -4,9 +4,6 @@ import /vendor/etc/init/hw/init.zumapro.rc
 on init && property:ro.vendor.factory=1
     import /vendor/etc/init/hw/init.factory.rc
 
-on init && property:ro.boot.hardware.platform=zuma
-    setprop vendor.powerhal.config powerhint-proto.json
-
 on init
     # eSE streset tool name
     setprop persist.vendor.se.streset libstreset24

device-caimito-common.mk

@@ -30,5 +30,4 @@ TARGET_VENDOR_PERF_CONFIG_PATH := device/google/caimito/perf
 endif
 
 PRODUCT_COPY_FILES += \
-	$(TARGET_VENDOR_PERF_CONFIG_PATH)/powerhint-$(TARGET_DEVICE).json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json \
-	$(TARGET_VENDOR_PERF_CONFIG_PATH)/powerhint-$(TARGET_DEVICE)-proto.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint-proto.json
+	$(TARGET_VENDOR_PERF_CONFIG_PATH)/powerhint-$(TARGET_DEVICE).json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json