commit cb9e9c350cc44ec6791580b013663093d1d10af8
author Abdulla Kamar <abdulla@google.com> Wed Jul 08 23:40:46 2020 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Wed Jul 08 23:40:46 2020 +0000
tree 61ed1aea872066b60563433358966bf7c9529a02
parent a8cc420c6038406a85d2656a59cc5159b5bd6eea

[svchost] Allow ComponentRunner to be routed

Allow fuchsia.component.runner.ComponentRunner to be routed back to
driver_manager.

Bug: 33183
Change-Id: I27e23a5dbe5775040f2cd455b94c3c041936194d
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/405178
Testability-Review: Abdulla Kamar <abdulla@google.com>
Reviewed-by: Tess Eisenberger <teisenbe@google.com>
Commit-Queue: Abdulla Kamar <abdulla@google.com>

src/bringup/bin/svchost/BUILD.gn

diff --git a/src/bringup/bin/svchost/BUILD.gn b/src/bringup/bin/svchost/BUILD.gn
index 12c250b..ead426a 100644
--- a/src/bringup/bin/svchost/BUILD.gn
+++ b/src/bringup/bin/svchost/BUILD.gn
@@ -42,6 +42,7 @@
   deps = [
     ":crashsvc",
     "//sdk/fidl/fuchsia.boot:fuchsia.boot_c",
+    "//sdk/fidl/fuchsia.component.runner:fuchsia.component.runner_c",
     "//sdk/fidl/fuchsia.device:fuchsia.device_c",
     "//sdk/fidl/fuchsia.device:fuchsia.device_llcpp",
     "//sdk/fidl/fuchsia.device.manager:fuchsia.device.manager_c",

src/bringup/bin/svchost/svchost.cc

diff --git a/src/bringup/bin/svchost/svchost.cc b/src/bringup/bin/svchost/svchost.cc
index daf72b5..13d45cd 100644
--- a/src/bringup/bin/svchost/svchost.cc
+++ b/src/bringup/bin/svchost/svchost.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include <fuchsia/boot/c/fidl.h>
+#include <fuchsia/component/runner/c/fidl.h>
 #include <fuchsia/device/c/fidl.h>
 #include <fuchsia/device/manager/c/fidl.h>
 #include <fuchsia/device/manager/llcpp/fidl.h>
@@ -231,11 +232,12 @@
 
 // List of services which are re-routed to devmgr.
 static constexpr const char* devmgr_services[] = {
-    llcpp::fuchsia::device::manager::SystemStateTransition::Name,
+    fuchsia_component_runner_ComponentRunner_Name,
     fuchsia_device_manager_Administrator_Name,
     fuchsia_device_manager_DebugDumper_Name,
     fuchsia_hardware_power_statecontrol_RebootMethodsWatcherRegister_Name,
     llcpp::fuchsia::device::manager::BindDebugger::Name,
+    llcpp::fuchsia::device::manager::SystemStateTransition::Name,
     nullptr,
 };