Split PowerHAL into HIDL impl and library

Bug: 147840817
Test: boot
Change-Id: Ieb394e0433c4775e84e11e881898933ef93fd08d

12 files changed, 37 insertions, 20 deletions

diff --git a/power-libperfmgr/Android.bp b/power-libperfmgr/Android.bp
index ca2aedaf..4b877736 100644
--- a/power-libperfmgr/Android.bp
+++ b/power-libperfmgr/Android.bp
@@ -13,19 +13,34 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+cc_library {
+    name: "libdisppower-pixel",
+    proprietary: true,
+    srcs: [
+        "disp-power/display-helper.cpp",
+        "disp-power/InteractionHandler.cpp",
+    ],
+     shared_libs: [
+        "libbase",
+        "libcutils",
+        "liblog",
+        "libperfmgr",
+        "libutils",
+    ],
+}
+
 cc_library_headers {
     name: "pixel_power_headers",
-    vendor_available: true,
-    export_include_dirs: ["."],
+    vendor: true,
+    export_include_dirs: ["hidl"],
 }
 
 cc_binary {
     name: "android.hardware.power@1.3-service.pixel-libperfmgr",
     relative_install_path: "hw",
-    vintf_fragments: ["android.hardware.power@1.3-service.pixel.xml"],
-    init_rc: ["android.hardware.power@1.3-service.pixel-libperfmgr.rc"],
-    srcs: ["service.cpp", "Power.cpp", "InteractionHandler.cpp",
-            "display-helper.cpp"],
+    vintf_fragments: ["hidl/android.hardware.power@1.3-service.pixel.xml"],
+    init_rc: ["hidl/android.hardware.power@1.3-service.pixel-libperfmgr.rc"],
+    srcs: ["hidl/service.cpp", "hidl/Power.cpp"],
     cflags: [
         "-Wall",
         "-Werror",
@@ -40,6 +55,7 @@ cc_binary {
         "android.hardware.power@1.1",
         "android.hardware.power@1.2",
         "android.hardware.power@1.3",
+        "libdisppower-pixel",
         "libperfmgr",
     ],
     proprietary: true,
diff --git a/power-libperfmgr/InteractionHandler.cpp b/power-libperfmgr/disp-power/InteractionHandler.cpp
index da6a9173..da6a9173 100644
--- a/power-libperfmgr/InteractionHandler.cpp
+++ b/power-libperfmgr/disp-power/InteractionHandler.cpp
diff --git a/power-libperfmgr/InteractionHandler.h b/power-libperfmgr/disp-power/InteractionHandler.h
index ba767f14..ba767f14 100644
--- a/power-libperfmgr/InteractionHandler.h
+++ b/power-libperfmgr/disp-power/InteractionHandler.h
diff --git a/power-libperfmgr/display-helper.cpp b/power-libperfmgr/disp-power/display-helper.cpp
index 2369c631..2369c631 100644
--- a/power-libperfmgr/display-helper.cpp
+++ b/power-libperfmgr/disp-power/display-helper.cpp
diff --git a/power-libperfmgr/display-helper.h b/power-libperfmgr/disp-power/display-helper.h
index 70b96975..70b96975 100644
--- a/power-libperfmgr/display-helper.h
+++ b/power-libperfmgr/disp-power/display-helper.h
diff --git a/power-libperfmgr/AudioStreaming.h b/power-libperfmgr/hidl/AudioStreaming.h
index d8772d53..d8772d53 100644
--- a/power-libperfmgr/AudioStreaming.h
+++ b/power-libperfmgr/hidl/AudioStreaming.h
diff --git a/power-libperfmgr/CameraMode.h b/power-libperfmgr/hidl/CameraMode.h
index 1e056231..1e056231 100644
--- a/power-libperfmgr/CameraMode.h
+++ b/power-libperfmgr/hidl/CameraMode.h
diff --git a/power-libperfmgr/Power.cpp b/power-libperfmgr/hidl/Power.cpp
index f199bfb2..1092670d 100644
--- a/power-libperfmgr/Power.cpp
+++ b/power-libperfmgr/hidl/Power.cpp
@@ -17,20 +17,21 @@
 #define ATRACE_TAG (ATRACE_TAG_POWER | ATRACE_TAG_HAL)
 #define LOG_TAG "android.hardware.power@1.3-service.pixel-libperfmgr"
 
+#include "Power.h"
+
+#include <mutex>
+
 #include <android-base/file.h>
 #include <android-base/logging.h>
 #include <android-base/properties.h>
 #include <android-base/stringprintf.h>
 #include <android-base/strings.h>
 
-#include <mutex>
-
 #include <utils/Log.h>
 #include <utils/Trace.h>
 
 #include "AudioStreaming.h"
-#include "Power.h"
-#include "display-helper.h"
+#include "disp-power/display-helper.h"
 
 namespace android {
 namespace hardware {
@@ -312,8 +313,8 @@ Return<void> Power::powerHintAsync_1_2(PowerHint_1_2 hint, int32_t data) {
 
             mCameraStreamingMode = mode;
             const auto prop = (mCameraStreamingMode == CAMERA_STREAMING_OFF)
-                                  ? ""
-                                  : kCamStreamingHint.at(mode).c_str();
+                                      ? ""
+                                      : kCamStreamingHint.at(mode).c_str();
             if (!android::base::SetProperty(kPowerHalStateProp, prop)) {
                 ALOGE("%s: could set powerHAL state %s property", __func__, prop);
             }
@@ -366,13 +367,13 @@ Return<void> Power::debug(const hidl_handle &handle, const hidl_vec<hidl_string>
         int fd = handle->data[0];
 
         std::string buf(android::base::StringPrintf(
-            "HintManager Running: %s\n"
-            "VRMode: %s\n"
-            "CameraStreamingMode: %s\n"
-            "SustainedPerformanceMode: %s\n",
-            boolToString(mHintManager->IsRunning()), boolToString(mVRModeOn),
-            kCamStreamingHint.at(mCameraStreamingMode).c_str(),
-            boolToString(mSustainedPerfModeOn)));
+                "HintManager Running: %s\n"
+                "VRMode: %s\n"
+                "CameraStreamingMode: %s\n"
+                "SustainedPerformanceMode: %s\n",
+                boolToString(mHintManager->IsRunning()), boolToString(mVRModeOn),
+                kCamStreamingHint.at(mCameraStreamingMode).c_str(),
+                boolToString(mSustainedPerfModeOn)));
         // Dump nodes through libperfmgr
         mHintManager->DumpToFd(fd);
         if (!android::base::WriteStringToFd(buf, fd)) {
diff --git a/power-libperfmgr/Power.h b/power-libperfmgr/hidl/Power.h
index b43fecd7..a79f94f5 100644
--- a/power-libperfmgr/Power.h
+++ b/power-libperfmgr/hidl/Power.h
@@ -27,7 +27,7 @@
 #include <perfmgr/HintManager.h>
 
 #include "CameraMode.h"
-#include "InteractionHandler.h"
+#include "disp-power/InteractionHandler.h"
 
 namespace android {
 namespace hardware {
diff --git a/power-libperfmgr/android.hardware.power@1.3-service.pixel-libperfmgr.rc b/power-libperfmgr/hidl/android.hardware.power@1.3-service.pixel-libperfmgr.rc
index 6179f6e1..6179f6e1 100644
--- a/power-libperfmgr/android.hardware.power@1.3-service.pixel-libperfmgr.rc
+++ b/power-libperfmgr/hidl/android.hardware.power@1.3-service.pixel-libperfmgr.rc
diff --git a/power-libperfmgr/android.hardware.power@1.3-service.pixel.xml b/power-libperfmgr/hidl/android.hardware.power@1.3-service.pixel.xml
index e52398c0..e52398c0 100644
--- a/power-libperfmgr/android.hardware.power@1.3-service.pixel.xml
+++ b/power-libperfmgr/hidl/android.hardware.power@1.3-service.pixel.xml
diff --git a/power-libperfmgr/service.cpp b/power-libperfmgr/hidl/service.cpp
index 7bcc9078..7bcc9078 100644
--- a/power-libperfmgr/service.cpp
+++ b/power-libperfmgr/hidl/service.cpp