Revert "zenfone7: Use common power-libperfmgr"
This reverts commit 471ae48cded949825d13fddb6ff7ab9c43ee180d.
Change-Id: I3867fed5f87b8022a9464c63ffef42ecc4b84ecf
Signed-off-by: micky387 <mickaelsaibi@free.fr>
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 2615c63..a856dc9 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -87,7 +87,6 @@
VENDOR_SECURITY_PATCH := 2023-05-01
# Sepolicy
-include vendor/omni/sepolicy/libperfmgr/sepolicy.mk
BOARD_VENDOR_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/vendor
# inherit from the proprietary version
diff --git a/device.mk b/device.mk
index 65308fe..2463a7f 100755
--- a/device.mk
+++ b/device.mk
@@ -95,9 +95,6 @@
vendor.qti.hardware.perf@2.3
# Power
-PRODUCT_PACKAGES += \
- android.hardware.power-service.lineage-libperfmgr
-
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
@@ -128,10 +125,7 @@
# Soong namespaces
PRODUCT_SOONG_NAMESPACES += \
- $(LOCAL_PATH) \
- hardware/omni/interfaces/power-libperfmgr \
- hardware/google/interfaces \
- hardware/google/pixel
+ $(LOCAL_PATH)
# Thermal
PRODUCT_COPY_FILES += \
diff --git a/extract-files.py b/extract-files.py
index 85cf9c1..c2f3e97 100755
--- a/extract-files.py
+++ b/extract-files.py
@@ -55,6 +55,8 @@
.replace_needed('libOpenCL.so', 'libOpenCL_system.so'),
'system_ext/lib64/libqti-iopd-client_system.so': blob_fixup()
.replace_needed('vendor.qti.hardware.iop@2.0.so', 'vendor.qti.hardware.iop@2.0_system.so'),
+ 'vendor/bin/hw/android.hardware.power-service': blob_fixup()
+ .replace_needed('android.hardware.power-V1-ndk_platform.so', 'android.hardware.power-V1-ndk.so'),
'vendor/etc/msm_irqbalance.conf': blob_fixup()
.regex_replace('IGNORED_IRQ=27,23,38$', 'IGNORED_IRQ=27,23,38,115,332'),
'vendor/etc/seccomp_policy/qspm.policy': blob_fixup()
diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt
index 1f91b18..26cf4e3 100644
--- a/proprietary-files-vendor.txt
+++ b/proprietary-files-vendor.txt
@@ -107,6 +107,7 @@
vendor/bin/hw/android.hardware.gnss@2.1-service-qti
vendor/bin/hw/android.hardware.keymaster@4.0-service-qti
vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti
+vendor/bin/hw/android.hardware.power-service
vendor/bin/hw/android.hardware.usb@1.2-service-qti
vendor/bin/hw/qcrild
vendor/bin/hw/vendor.display.color@1.0-service
@@ -363,6 +364,7 @@
vendor/etc/init/android.hardware.gnss@2.1-service-qti.rc
vendor/etc/init/android.hardware.keymaster@4.0-service-qti.rc
vendor/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc
+vendor/etc/init/android.hardware.power-service.rc
vendor/etc/init/android.hardware.usb@1.2-service-qti.rc
vendor/etc/init/cnd.rc
vendor/etc/init/dataadpl.rc
@@ -992,6 +994,7 @@
vendor/etc/vintf/manifest/android.hardware.usb@1.2-service.xml
vendor/etc/vintf/manifest/c2_manifest_vendor.xml
vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml
+vendor/etc/vintf/manifest/power.xml
vendor/etc/vintf/manifest/vendor.goodix.hardware.biometrics.fingerprint.xml
vendor/etc/vintf/manifest/vendor.qti.gnss@4.0-service.xml
vendor/etc/vintf/manifest/vendor.qti.hardware.servicetracker@1.2-service.xml
@@ -1199,6 +1202,7 @@
vendor/lib/hw/com.dsi.ant@1.0-impl.so
vendor/lib/hw/fingerprint.default.so
vendor/lib/hw/local_time.default.so
+vendor/lib/hw/power.default.so
vendor/lib/hw/sound_trigger.primary.kona.so
vendor/lib/hw/vendor.qti.esepowermanager@1.1-impl.so
vendor/lib/hw/vendor.qti.gnss@4.0-impl.so
@@ -1817,6 +1821,7 @@
vendor/lib64/hw/com.qti.chi.override.so
vendor/lib64/hw/fingerprint.default.so;FIX_SONAME
vendor/lib64/hw/local_time.default.so
+vendor/lib64/hw/power.default.so
vendor/lib64/hw/sound_trigger.primary.kona.so
vendor/lib64/hw/vendor.qti.esepowermanager@1.1-impl.so
vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so