zenfone7: Use common power-libperfmgr
Change-Id: I22d6b35c72629553817005deaefcae60abc72cfd
Signed-off-by: micky387 <mickaelsaibi@free.fr>
diff --git a/BoardConfig.mk b/BoardConfig.mk
index a856dc9..2615c63 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -87,6 +87,7 @@
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 20eb713..2404897 100755
--- a/device.mk
+++ b/device.mk
@@ -94,6 +94,10 @@
PRODUCT_PACKAGES += \
vendor.qti.hardware.perf@2.3
+# Power
+PRODUCT_PACKAGES += \
+ android.hardware.power-service.lineage-libperfmgr
+
# Prebuilt
PRODUCT_COPY_FILES += \
$(call find-copy-subdir-files,*,device/asus/zenfone7/prebuilt/system,system) \
@@ -121,7 +125,10 @@
# Soong namespaces
PRODUCT_SOONG_NAMESPACES += \
- $(LOCAL_PATH)
+ $(LOCAL_PATH) \
+ hardware/omni/interfaces/power-libperfmgr \
+ hardware/google/interfaces \
+ hardware/google/pixel
# Vibrator
PRODUCT_PACKAGES += \
diff --git a/extract-files.py b/extract-files.py
index c2f3e97..85cf9c1 100755
--- a/extract-files.py
+++ b/extract-files.py
@@ -55,8 +55,6 @@
.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 b8c61bd..5735927 100644
--- a/proprietary-files-vendor.txt
+++ b/proprietary-files-vendor.txt
@@ -108,7 +108,6 @@
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.thermal@2.0-service.qti
vendor/bin/hw/android.hardware.usb@1.2-service-qti
vendor/bin/hw/qcrild
@@ -366,7 +365,6 @@
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.thermal@2.0-service.qti.rc
vendor/etc/init/android.hardware.usb@1.2-service-qti.rc
vendor/etc/init/cnd.rc
@@ -999,7 +997,6 @@
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
@@ -1301,7 +1298,6 @@
vendor/lib/hw/com.qti.chi.override.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
@@ -1944,7 +1940,6 @@
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