diff --git a/configs/perf/power_app_cfg.xml b/configs/perf/power_app_cfg.xml
deleted file mode 100644
index 4b7618e..0000000
--- a/configs/perf/power_app_cfg.xml
+++ /dev/null
@@ -1,567 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/configs/perf/powercontable.xml b/configs/perf/powercontable.xml
deleted file mode 100644
index ec1917d..0000000
--- a/configs/perf/powercontable.xml
+++ /dev/null
@@ -1,382 +0,0 @@
-
-
-
-
- more
- 100
- -100
-
-
-
- more
- 100
- 0
- 0
-
-
-
- more
- 100
- -100
- 0
-
-
-
- more
- 100
- -100
-
-
-
- less
- 20
- 1
-
-
-
- more
- 20
- 1
-
-
-
- less
- 2
- 0
- -1
-
-
-
- more
- 1
- 0
- 0
-
-
-
- more
- 1
- 0
- 0
-
-
-
- more
- 15
- 1
- 1
-
-
-
- more
- 6
- 0
-
-
-
- less
- 10000000
- 1000
- 200000
-
-
-
- more
- 1
- 0
- 0
-
-
-
- more
- 1
- 0
- 0
-
-
-
- more
- 100
- 0
-
-
-
- more
- 100
- 0
-
-
-
- more
- 100
- 0
-
-
-
- more
- 100
- 0
-
-
-
- more
- 1
- 0
- 0
-
-
-
- more
- 101
- -1
- 100
-
-
-
- more
- 1
- 0
- 0
-
-
-
- more
- 100000000
- 0
- -1
-
-
-
- less
- 1
- 0
- -1
-
-
-
- more
- 110
- 10
- 10
-
-
-
- more
- 2
- 0
- 0
-
-
-
- more
- 100
- 0
-
-
-
- more
- 100
- 0
-
-
-
- more
- 1
- 0
-
-
-
- more
- 1000000
- 33
-
-
-
- more
- 1
- 0
-
-
-
- more
- 1
- 0
- CAM^
- 1
-
-
-
- less
- 5
- 0
- 2
- touch_opp^
-
-
-
- more
- 2000000000
- 10000000
- 100000000
- duration^
-
-
-
- more
- 1000000
- 0
- 100000
- active_time^
-
-
-
- less
- 4000000
- 0
- -1
-
-
-
- more
- 2000000000
- 0
-
-
-
- more
- 100
- 0
-
-
-
- more
- 80
- 1
-
-
-
- more
- 25855
- 0
- 4
-
-
-
- more
- 100
- 0
-
-
-
- more
- 32767
- 1
-
-
-
- more
- 32767
- 1
-
-
-
- less
- 1
- 0
-
-
-
- more
- 32767
- 8
-
-
-
- more
- 32768
- 1
-
-
-
- more
- 32768
- 1
-
-
-
- more
- 15
- 0
-
-
-
- more
- 15
- 0
-
-
-
- more
- 1
- 0
-
-
-
- more
- 32767
- 0
-
-
-
- more
- 32767
- 0
-
-
-
- more
- 16000000
- 0
-
-
-
- more
- 65535
- 0
-
-
-
- more
- 100
- 0
-
-
-
- more
- 1
- 0
- 0
-
-
-
- more
- 1
- 0
-
-
-
- more
- 1
- 0
- 0
- 1
-
-
-
- more
- 1
- 0
- enable^
-
-
-
diff --git a/configs/perf/powerscntbl.xml b/configs/perf/powerscntbl.xml
deleted file mode 100644
index bc88a6e..0000000
--- a/configs/perf/powerscntbl.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/device.mk b/device.mk
index 589c94a..3230c3c 100644
--- a/device.mk
+++ b/device.mk
@@ -338,19 +338,13 @@ PRODUCT_PACKAGES += \
# Power
PRODUCT_PACKAGES += \
android.hardware.power-service-mediatek \
- android.hardware.power-V2-ndk_platform.vendor \
- android.hardware.power@1.0.vendor \
- android.hardware.power@1.1.vendor \
- android.hardware.power@1.2.vendor \
+ android.hardware.power@1.3.vendor
+
+PRODUCT_PACKAGES += \
vendor.mediatek.hardware.mtkpower@1.0.vendor \
vendor.mediatek.hardware.mtkpower@1.1.vendor \
vendor.mediatek.hardware.mtkpower@1.2.vendor
-PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/configs/perf/power_app_cfg.xml:$(TARGET_COPY_OUT_VENDOR)/etc/power_app_cfg.xml \
- $(LOCAL_PATH)/configs/perf/powercontable.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powercontable.xml \
- $(LOCAL_PATH)/configs/perf/powerscntbl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerscntbl.xml
-
# PowerOffAlarm
PRODUCT_PACKAGES += \
PowerOffAlarm
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 2193058..f0579d6 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -2215,17 +2215,12 @@ vendor/lib64/libmvpu_config_data.so
# Perf
vendor/bin/hw/vendor.mediatek.hardware.mtkpower@1.0-service
-vendor/etc/init/bootperf.rc
-vendor/etc/init/init.fpsgo.rc
vendor/etc/init/vendor.mediatek.hardware.mtkpower@1.0-init.rc
vendor/etc/init/vendor.mediatek.hardware.mtkpower@1.0-service.rc
-vendor/lib/hw/vendor.mediatek.hardware.mtkpower@1.2-impl.so
+vendor/etc/power_app_cfg.xml
+vendor/etc/powercontable.xml
+vendor/etc/powerscntbl.xml
vendor/lib/libmtkperf_client_vendor.so
-vendor/lib/libperfctl_vendor.so
-vendor/lib/libpower_timer.so
-vendor/lib/libpowerhal.so
-vendor/lib/libpowerhalwrap_vendor.so
-vendor/lib/vendor.mediatek.hardware.power@2.0.so
vendor/lib64/hw/vendor.mediatek.hardware.mtkpower@1.2-impl.so
vendor/lib64/libmtkperf_client_vendor.so
vendor/lib64/libperfctl_vendor.so