commit b6a5518f507f43589121b4ce435887a1c499ab70
author Jiaqing Zhao <jiaqing.zhao@intel.com> Fri May 20 11:47:46 2022 +0800
committer Jiaqing Zhao <jiaqing.zhao@intel.com> Fri May 20 11:52:09 2022 +0800
tree c4a0bd06d6a831fcb3136f4719fbab9d5e34a14d
parent 4cee35e72cc593f7d407c110ed8c19afb78d279c

google_api: Fix build issue

Commit 4cee35e ("Add RootOfTrustCollection and RootOfTrust under Google
service root.") still uses the crow::openbmc_mapper::GetSubTreeType
removed in b9d36b4 ("Consitently use dbus::utility types"), causing
build failure. This patch fixes the build issue by using the
dbus::utility::MapperGetSubTreeResponse instead.

Tested:
Build pass.

Change-Id: Ia2ca965f320ef18f431bfcb6d62c9c44eb935d9d
Signed-off-by: Jiaqing Zhao <jiaqing.zhao@intel.com>

include/google/google_service_root.hpp

diff --git a/include/google/google_service_root.hpp b/include/google/google_service_root.hpp
index 42d2af9..441ddcf5 100644
--- a/include/google/google_service_root.hpp
+++ b/include/google/google_service_root.hpp
@@ -2,6 +2,7 @@
 
 #include <app.hpp>
 #include <async_resp.hpp>
+#include <dbus_utility.hpp>
 #include <error_messages.hpp>
 #include <nlohmann/json.hpp>
 #include <utils/collection.hpp>
@@ -65,7 +66,7 @@
                          entityHandler{std::forward<ResolvedEntityHandler>(
                              entityHandler)}](
                             const boost::system::error_code ec,
-                            const crow::openbmc_mapper::GetSubTreeType&
+                            const dbus::utility::MapperGetSubTreeResponse&
                                 subtree) {
         if (ec)
         {