Commit 5a061a65 authored by Leo Lai's avatar Leo Lai Committed by Commit Bot

Initialize attestation client in dbus_helper.cc

Change-Id: I62e307e35fd70b90697f52c2d823faf49b1c40a7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2249275
Commit-Queue: Leo Lai <cylai@google.com>
Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#780663}
parent 1485de6a
...@@ -127,6 +127,8 @@ source_set("chromeos") { ...@@ -127,6 +127,8 @@ source_set("chromeos") {
"//chromeos/dbus:plugin_vm_service_proto", "//chromeos/dbus:plugin_vm_service_proto",
"//chromeos/dbus:update_engine_proto", "//chromeos/dbus:update_engine_proto",
"//chromeos/dbus:vm_plugin_dispatcher_proto", "//chromeos/dbus:vm_plugin_dispatcher_proto",
"//chromeos/dbus/attestation",
"//chromeos/dbus/attestation:attestation_proto",
"//chromeos/dbus/audio", "//chromeos/dbus/audio",
"//chromeos/dbus/authpolicy", "//chromeos/dbus/authpolicy",
"//chromeos/dbus/authpolicy:authpolicy_proto", "//chromeos/dbus/authpolicy:authpolicy_proto",
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include "chromeos/constants/chromeos_paths.h" #include "chromeos/constants/chromeos_paths.h"
#include "chromeos/cryptohome/system_salt_getter.h" #include "chromeos/cryptohome/system_salt_getter.h"
#include "chromeos/dbus/arc_camera_client.h" #include "chromeos/dbus/arc_camera_client.h"
#include "chromeos/dbus/attestation/attestation_client.h"
#include "chromeos/dbus/audio/cras_audio_client.h" #include "chromeos/dbus/audio/cras_audio_client.h"
#include "chromeos/dbus/authpolicy/authpolicy_client.h" #include "chromeos/dbus/authpolicy/authpolicy_client.h"
#include "chromeos/dbus/biod/biod_client.h" #include "chromeos/dbus/biod/biod_client.h"
...@@ -63,6 +64,7 @@ void InitializeDBus() { ...@@ -63,6 +64,7 @@ void InitializeDBus() {
// NOTE: base::Feature is not initialized yet, so any non MultiProcessMash // NOTE: base::Feature is not initialized yet, so any non MultiProcessMash
// dbus client initialization for Ash should be done in Shell::Init. // dbus client initialization for Ash should be done in Shell::Init.
InitializeDBusClient<ArcCameraClient>(bus); InitializeDBusClient<ArcCameraClient>(bus);
InitializeDBusClient<AttestationClient>(bus);
InitializeDBusClient<AuthPolicyClient>(bus); InitializeDBusClient<AuthPolicyClient>(bus);
InitializeDBusClient<BiodClient>(bus); // For device::Fingerprint. InitializeDBusClient<BiodClient>(bus); // For device::Fingerprint.
InitializeDBusClient<CdmFactoryDaemonClient>(bus); InitializeDBusClient<CdmFactoryDaemonClient>(bus);
...@@ -122,6 +124,7 @@ void ShutdownDBus() { ...@@ -122,6 +124,7 @@ void ShutdownDBus() {
CdmFactoryDaemonClient::Shutdown(); CdmFactoryDaemonClient::Shutdown();
BiodClient::Shutdown(); BiodClient::Shutdown();
AuthPolicyClient::Shutdown(); AuthPolicyClient::Shutdown();
AttestationClient::Shutdown();
ArcCameraClient::Shutdown(); ArcCameraClient::Shutdown();
DBusThreadManager::Shutdown(); DBusThreadManager::Shutdown();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment