zenfone7: Use common libqti-perfd-client and power-libperfmgr

Change-Id: I22d6b35c72629553817005deaefcae60abc72cfd
Signed-off-by: micky387 <mickaelsaibi@free.fr>
diff --git a/Android.bp b/Android.bp
index 4443de2..071277a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,9 @@
 soong_namespace {
-    imports: ["hardware/qcom/bootctrl"],
+    imports: [
+        "hardware/qcom/bootctrl",
+        "hardware/google/interfaces",
+        "hardware/google/pixel",
+    ],
 }
 
 prebuilt_hidl_interfaces {
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 8cf9062..1e0bac2 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -217,8 +217,9 @@
 VENDOR_SECURITY_PATCH := 2023-05-01
 
 # Sepolicy
-include vendor/omni/sepolicy/sepolicy.mk
 include device/qcom/sepolicy_vndr/SEPolicy.mk
+include vendor/omni/sepolicy/libperfmgr/sepolicy.mk
+include vendor/omni/sepolicy/sepolicy.mk
 
 BOARD_VENDOR_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/vendor
 PRODUCT_PRIVATE_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/product/private
diff --git a/device.mk b/device.mk
index 25b14f4..f634e09 100755
--- a/device.mk
+++ b/device.mk
@@ -254,7 +254,8 @@
 
 # Power
 PRODUCT_PACKAGES += \
-    android.hardware.power-service-qti
+    android.hardware.power-service.lineage-libperfmgr \
+    libqti-perfd-client
 
 # Prebuilt
 PRODUCT_COPY_FILES += \
@@ -288,7 +289,11 @@
 
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
-    $(LOCAL_PATH)
+    $(LOCAL_PATH) \
+    hardware/omni/interfaces/power-libperfmgr \
+    hardware/google/interfaces \
+    hardware/google/pixel \
+    hardware/qcom-caf/common/libqti-perfd-client
 
 # Systemhelper
 PRODUCT_PACKAGES += \
diff --git a/extract-files.py b/extract-files.py
index 1c0dedf..9097fde 100755
--- a/extract-files.py
+++ b/extract-files.py
@@ -53,8 +53,6 @@
     ('system/lib64/libxditk_ISP.so',
      'system/lib64/libxditk_ditArchLIB.so'): blob_fixup()
         .replace_needed('libOpenCL.so', 'libOpenCL_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/omni.dependencies b/omni.dependencies
index de9de2c..ff60c61 100644
--- a/omni.dependencies
+++ b/omni.dependencies
@@ -103,12 +103,6 @@
      "revision": "android-15"
    },
    {
-    "remote": "gitlab",
-    "repository": "android_vendor_qcom_opensource_power",
-    "target_path": "vendor/qcom/opensource/power",
-    "revision": "android-15"
-   },
-   {
     "remote": "github",
     "repository": "LineageOS/android_vendor_qcom_opensource_thermal-engine",
     "target_path": "vendor/qcom/opensource/thermal-engine",