diff options
| author | Byron Lee <byronlee@google.com> | 2023-07-20 01:32:37 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-07-20 12:41:20 +0000 |
| commit | b88f9de05a97b9bc540a52331501a1aaef825a68 (patch) | |
| tree | ce0067c9c66069d5f92eb534c5cd026d3630260b | |
| parent | 9a84fcdbc02f6837bdff3331f4a3a5d670316db2 (diff) | |
| download | update_engine-b88f9de05a97b9bc540a52331501a1aaef825a68.tar.gz | |
update_engine: Update to use cros_healthd-client package
We should use generated mojo interfaces instead of building them again.
BUG=None
TEST=FEATURES=test emerge-reven update_engine
TEST=FEATURES=test emerge-volteer update_engine
Cq-Depend: chromium:4702558
Change-Id: I714d38f79e39d611d7f97241a27720076c1d3d43
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/4702131
Commit-Queue: Byron Lee <byronlee@chromium.org>
Tested-by: Byron Lee <byronlee@chromium.org>
Reviewed-by: Jae Hoon Kim <kimjae@chromium.org>
| -rw-r--r-- | BUILD.gn | 13 | ||||
| -rw-r--r-- | common/cros_healthd.h | 5 |
2 files changed, 12 insertions, 6 deletions
@@ -282,12 +282,15 @@ static_library("libupdate_engine") { ] if (use.hw_details) { - deps += [ "//diagnostics/mojom/public:cros_healthd_mojo_bindings" ] sources += [ "common/cros_healthd.cc", "common/telemetry_info.cc", ] - pkg_deps += [ "mojo_service_manager" ] + pkg_deps += [ + "cros_healthd-client", + "libmojo", + "mojo_service_manager", + ] } else { sources += [ "common/cros_healthd_stub.cc", @@ -611,7 +614,11 @@ if (use.test) { if (use.hw_details) { sources += [ "common/cros_healthd_test.cc" ] - pkg_deps += [ "mojo_service_manager" ] + pkg_deps += [ + "cros_healthd-client", + "libmojo", + "mojo_service_manager", + ] } if (use.dlc) { sources += [ "cros/excluder_chromeos_unittest.cc" ] diff --git a/common/cros_healthd.h b/common/cros_healthd.h index c9779f57..1be7f403 100644 --- a/common/cros_healthd.h +++ b/common/cros_healthd.h @@ -25,14 +25,13 @@ #include <gtest/gtest_prod.h> // for FRIEND_TEST +#include <diagnostics/mojom/public/cros_healthd.mojom.h> +#include <diagnostics/mojom/public/cros_healthd_probe.mojom.h> #include <mojo/core/embedder/embedder.h> #include <mojo/core/embedder/scoped_ipc_support.h> #include <mojo/public/cpp/bindings/remote.h> #include <mojo_service_manager/lib/mojom/service_manager.mojom.h> -#include "diagnostics/mojom/public/cros_healthd.mojom.h" -#include "diagnostics/mojom/public/cros_healthd_probe.mojom.h" - namespace chromeos_update_engine { class CrosHealthd : public CrosHealthdInterface { |