From 20183060098f3c6b91e9350047752b5c859e7028 Mon Sep 17 00:00:00 2001
From: Chenyang Zhong <zhongcy95@gmail.com>
Date: Sat, 10 Sep 2022 07:14:40 -0400
Subject: [PATCH] sdm710-common: power: rename pixel to lenovo-sdm710

Signed-off-by: Chenyang Zhong <zhongcy95@gmail.com>
---
 power-libperfmgr/Android.bp                   | 26 +++++++------------
 ...power-service.lenovo-sdm710-libperfmgr.rc} |  2 +-
 ....hardware.power-service.lenovo-sdm710.xml} |  0
 sdm710.mk                                     |  3 ++-
 4 files changed, 12 insertions(+), 19 deletions(-)
 rename power-libperfmgr/aidl/{android.hardware.power-service.pixel-libperfmgr.rc => android.hardware.power-service.lenovo-sdm710-libperfmgr.rc} (97%)
 rename power-libperfmgr/aidl/{android.hardware.power-service.pixel.xml => android.hardware.power-service.lenovo-sdm710.xml} (100%)

diff --git a/power-libperfmgr/Android.bp b/power-libperfmgr/Android.bp
index 7eccf52..08f1283 100644
--- a/power-libperfmgr/Android.bp
+++ b/power-libperfmgr/Android.bp
@@ -18,7 +18,7 @@ package {
 }
 
 cc_library {
-    name: "libdisppower-pixel",
+    name: "libdisppower-lenovo-sdm710",
     proprietary: true,
     srcs: [
         "disp-power/DisplayLowPower.cpp",
@@ -34,7 +34,7 @@ cc_library {
 }
 
 cc_library {
-    name: "libadaptivecpu",
+    name: "libadaptivecpu-lenovo-sdm710",
     proprietary: true,
     vendor: true,
     srcs: [
@@ -63,7 +63,7 @@ cc_library {
 }
 
 cc_test {
-    name: "libadaptivecpu_test",
+    name: "libadaptivecpu_test-lenovo-sdm710",
     proprietary: true,
     vendor: true,
     srcs: [
@@ -77,7 +77,7 @@ cc_test {
         "adaptivecpu/tests/WorkDurationProcessorTest.cpp",
     ],
     static_libs: [
-        "libadaptivecpu",
+        "libadaptivecpu-lenovo-sdm710",
         "libgmock",
         "android.hardware.power-V3-ndk",
     ],
@@ -89,29 +89,21 @@ cc_test {
     test_suites: ["device-tests"],
 }
 
-// Deprecated, do not use
-// Use pixel-power-ext for vendor extension
-cc_library_headers {
-    name: "pixel_power_headers",
-    vendor: true,
-    export_include_dirs: ["hidl"],
-}
-
 cc_binary {
-    name: "android.hardware.power-service.pixel-libperfmgr",
+    name: "android.hardware.power-service.lenovo-sdm710-libperfmgr",
     relative_install_path: "hw",
-    init_rc: ["aidl/android.hardware.power-service.pixel-libperfmgr.rc"],
-    vintf_fragments: ["aidl/android.hardware.power-service.pixel.xml"],
+    init_rc: ["aidl/android.hardware.power-service.lenovo-sdm710-libperfmgr.rc"],
+    vintf_fragments: ["aidl/android.hardware.power-service.lenovo-sdm710.xml"],
     vendor: true,
     shared_libs: [
         "android.hardware.power-V3-ndk",
-        "libadaptivecpu",
+        "libadaptivecpu-lenovo-sdm710",
         "libbase",
         "libcutils",
         "liblog",
         "libutils",
         "libbinder_ndk",
-        "libdisppower-pixel",
+        "libdisppower-lenovo-sdm710",
         "libperfmgr",
         "libprocessgroup",
         "pixel-power-ext-V1-ndk",
diff --git a/power-libperfmgr/aidl/android.hardware.power-service.pixel-libperfmgr.rc b/power-libperfmgr/aidl/android.hardware.power-service.lenovo-sdm710-libperfmgr.rc
similarity index 97%
rename from power-libperfmgr/aidl/android.hardware.power-service.pixel-libperfmgr.rc
rename to power-libperfmgr/aidl/android.hardware.power-service.lenovo-sdm710-libperfmgr.rc
index 5dc9c9e..67648cd 100644
--- a/power-libperfmgr/aidl/android.hardware.power-service.pixel-libperfmgr.rc
+++ b/power-libperfmgr/aidl/android.hardware.power-service.lenovo-sdm710-libperfmgr.rc
@@ -1,4 +1,4 @@
-service vendor.power-hal-aidl /vendor/bin/hw/android.hardware.power-service.pixel-libperfmgr
+service vendor.power-hal-aidl /vendor/bin/hw/android.hardware.power-service.lenovo-sdm710-libperfmgr
     class hal
     user root
     group system
diff --git a/power-libperfmgr/aidl/android.hardware.power-service.pixel.xml b/power-libperfmgr/aidl/android.hardware.power-service.lenovo-sdm710.xml
similarity index 100%
rename from power-libperfmgr/aidl/android.hardware.power-service.pixel.xml
rename to power-libperfmgr/aidl/android.hardware.power-service.lenovo-sdm710.xml
diff --git a/sdm710.mk b/sdm710.mk
index 8ea24f1..79b2b49 100644
--- a/sdm710.mk
+++ b/sdm710.mk
@@ -332,7 +332,8 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.power@1.2 \
     android.hardware.power@1.2.vendor \
-    android.hardware.power-service.lenovo
+    android.hardware.power-service.lenovo-sdm710-libperfmgr \
+    android.hardware.power.stats@1.0-service.lenovo
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json