Skip to content

Commit

Permalink
[ui] Consolidate ui core shard CML routes
Browse files Browse the repository at this point in the history 
Test: built all affected products
Bug: 110658

Change-Id: I8bf3e565573e1fe52a0e594b11a92d9801c5e3dd
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/732665
Commit-Queue: Alexander Brusher <[email protected]>
Reviewed-by: Caroline Liu <[email protected]>
  • Loading branch information
@abrush21
abrush21 authored and CQ Bot committed Nov 1, 2022
1 parent 250d8b5 commit 753f051
Show file tree
Hide file tree
Showing 4 changed files with 186 additions and 446 deletions.
145 changes: 2 additions & 143 deletions src/ui/meta/ui.core_shard.cml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
{
include: [ "//src/ui/meta/ui_routes_base.shard.cml" ],
children: [
{
name: "ui",
Expand All @@ -13,139 +14,27 @@
// Protocols used from a child are routed to the v1 sys realm.
// See also //src/sys/appmgr/meta/appmgr.core_shard.cml
use: [
{
// Expose FlatlandDisplay to the V1 realm for the benefit of
// flatland_benchmark.
// TODO(fxbug.dev/104906): Remove this when no longer needed.
protocol: [ "fuchsia.ui.composition.FlatlandDisplay" ],
from: "#ui",
dependency: "weak_for_migration",
},
{
protocol: [
"fuchsia.accessibility.gesture.ListenerRegistry",
"fuchsia.accessibility.semantics.SemanticsManager",
"fuchsia.accessibility.tts.EngineRegistry",
"fuchsia.accessibility.tts.TtsManager",
"fuchsia.accessibility.virtualkeyboard.Registry",
"fuchsia.input.virtualkeyboard.ControllerCreator",
"fuchsia.input.virtualkeyboard.Manager",
"fuchsia.recovery.policy.Device",
"fuchsia.recovery.ui.FactoryResetCountdown",
"fuchsia.session.scene.Manager",
"fuchsia.ui.brightness.ColorAdjustmentHandler",
"fuchsia.ui.composition.Allocator",
"fuchsia.ui.composition.Flatland",
"fuchsia.ui.composition.internal.ScreenCapture",
"fuchsia.ui.composition.ScreenCapture",
"fuchsia.ui.display.singleton.Info",
"fuchsia.ui.focus.FocusChainListenerRegistry",
"fuchsia.ui.input.ImeService",
"fuchsia.ui.input3.Keyboard",
"fuchsia.ui.input3.KeyEventInjector",
"fuchsia.ui.keyboard.focus.Controller",
"fuchsia.ui.pointerinjector.Registry",
"fuchsia.ui.policy.DeviceListenerRegistry",
"fuchsia.ui.policy.DisplayBacklight",
"fuchsia.ui.scenic.Scenic",
"fuchsia.ui.shortcut.Manager",
"fuchsia.ui.views.ViewRefInstalled",
],
from: "#ui",
dependency: "weak_for_migration",
},
],
offer: [
{
protocol: [
"fuchsia.logger.LogSink",
"fuchsia.scheduler.ProfileProvider",
],
from: "parent",
to: "#ui",
},
{
protocol: "fuchsia.intl.PropertyProvider",
from: "#intl",
to: "#ui",
source_availability: "unknown",
},
{
protocol: "fuchsia.tracing.provider.Registry",
from: "#trace_manager",
to: "#ui",
source_availability: "unknown",
},
{
protocol: [ "fuchsia.metrics.MetricEventLoggerFactory" ],
from: "#cobalt",
to: "#ui",
},
{
protocol: [ "fuchsia.recovery.FactoryReset" ],
from: "#factory_reset",
to: "#ui",
},
{
protocol: [ "fuchsia.feedback.LastRebootInfoProvider" ],
from: "#feedback",
to: "#ui",
},
{
protocol: [
"fuchsia.settings.Accessibility",
"fuchsia.settings.Keyboard",
],
protocol: [ "fuchsia.settings.Keyboard" ],
from: "#setui_service",
to: "#ui",
},
{
protocol: [ "fuchsia.stash.Store" ],
from: "#stash",
to: "#ui",
},
{
protocol: [ "fuchsia.sysmem.Allocator" ],
from: "#sysmem_connector",
to: "#ui",
},
{
protocol: [ "fuchsia.vulkan.loader.Loader" ],
from: "#vulkan_loader",
to: "#ui",
},
{
protocol: [
"fuchsia.accessibility.gesture.ListenerRegistry",
"fuchsia.accessibility.semantics.SemanticsManager",
"fuchsia.accessibility.tts.EngineRegistry",
"fuchsia.accessibility.tts.TtsManager",
"fuchsia.accessibility.virtualkeyboard.Registry",
"fuchsia.input.virtualkeyboard.ControllerCreator",
"fuchsia.input.virtualkeyboard.Manager",
"fuchsia.recovery.policy.Device",
"fuchsia.recovery.ui.FactoryResetCountdown",
"fuchsia.session.scene.Manager",
"fuchsia.ui.brightness.ColorAdjustmentHandler",
"fuchsia.ui.composition.Allocator",
"fuchsia.ui.composition.Flatland",
"fuchsia.ui.composition.internal.ScreenCapture",
"fuchsia.ui.composition.ScreenCapture",
"fuchsia.ui.composition.Screenshot",
"fuchsia.ui.display.singleton.Info",
"fuchsia.ui.focus.FocusChainListenerRegistry",
"fuchsia.ui.input.ImeService",
"fuchsia.ui.input3.Keyboard",
"fuchsia.ui.input3.KeyEventInjector",
"fuchsia.ui.keyboard.focus.Controller",
"fuchsia.ui.pointer.augment.GlobalMouse",
"fuchsia.ui.pointerinjector.Registry",
"fuchsia.ui.policy.DeviceListenerRegistry",
"fuchsia.ui.policy.DisplayBacklight",
"fuchsia.ui.scenic.Scenic",
"fuchsia.ui.shortcut.Manager",
"fuchsia.ui.shortcut2.Registry",
"fuchsia.ui.views.ViewRefInstalled",
],
from: "#ui",
to: "#session-manager",
Expand All @@ -156,35 +45,5 @@
to: "#session-manager",
availability: "optional",
},
{
directory: "config-data",
from: "parent",
to: "#ui",
},
{
directory: "dev-class",
from: "parent",
as: "dev-display-controller",
to: [ "#ui" ],
subdir: "display-controller",
},
{
directory: "dev-class",
from: "parent",
as: "dev-input-report",
to: [ "#ui" ],
subdir: "input-report",
},
{
storage: [ "tmp" ],
from: "self",
to: "#ui",
},
{
protocol: [ "fuchsia.media.ProfileProvider" ],
from: "#audio_core",
to: "#ui",
source_availability: "unknown",
},
],
}
154 changes: 4 additions & 150 deletions src/ui/meta/ui_minimal.core_shard.cml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
{
include: [ "//src/ui/meta/ui_routes_base.shard.cml" ],
children: [
{
name: "ui",
Expand All @@ -14,87 +15,14 @@
// See also //src/sys/appmgr/meta/appmgr.core_shard.cml
use: [
{
// Expose FlatlandDisplay to the V1 realm for the benefit of
// flatland_benchmark.
// TODO(fxbug.dev/104906): Remove this when no longer needed.
protocol: [ "fuchsia.ui.composition.FlatlandDisplay" ],
from: "#ui",
dependency: "weak_for_migration",
},
{
protocol: [
"fuchsia.accessibility.gesture.ListenerRegistry",
"fuchsia.accessibility.semantics.SemanticsManager",
"fuchsia.accessibility.tts.EngineRegistry",
"fuchsia.accessibility.tts.TtsManager",
"fuchsia.accessibility.virtualkeyboard.Registry",
"fuchsia.input.virtualkeyboard.ControllerCreator",
"fuchsia.input.virtualkeyboard.Manager",
"fuchsia.recovery.policy.Device",
"fuchsia.recovery.ui.FactoryResetCountdown",
"fuchsia.session.scene.Manager",
"fuchsia.ui.brightness.ColorAdjustmentHandler",
"fuchsia.ui.composition.Allocator",
"fuchsia.ui.composition.Flatland",
"fuchsia.ui.composition.internal.ScreenCapture",
"fuchsia.ui.composition.ScreenCapture",
"fuchsia.ui.display.singleton.Info",
"fuchsia.ui.focus.FocusChainListenerRegistry",
"fuchsia.ui.input.ImeService",
"fuchsia.ui.input3.Keyboard",
"fuchsia.ui.input3.KeyEventInjector",
"fuchsia.ui.keyboard.focus.Controller",
"fuchsia.ui.pointerinjector.Registry",
"fuchsia.ui.policy.DeviceListenerRegistry",
"fuchsia.ui.policy.DisplayBacklight",
"fuchsia.ui.scenic.Scenic",
"fuchsia.ui.views.ViewRefInstalled",
],
protocol: [ "fuchsia.session.scene.Manager" ],
from: "#ui",
dependency: "weak_for_migration",
},
],
offer: [
{
protocol: [
"fuchsia.logger.LogSink",
"fuchsia.scheduler.ProfileProvider",
],
from: "parent",
to: "#ui",
},
{
protocol: "fuchsia.intl.PropertyProvider",
from: "#intl",
to: "#ui",
source_availability: "unknown",
},
{
protocol: "fuchsia.tracing.provider.Registry",
from: "#trace_manager",
to: "#ui",
source_availability: "unknown",
},
{
protocol: [ "fuchsia.metrics.MetricEventLoggerFactory" ],
from: "#cobalt",
to: "#ui",
},
{
protocol: [ "fuchsia.recovery.FactoryReset" ],
from: "#factory_reset",
to: "#ui",
},
{
protocol: [ "fuchsia.feedback.LastRebootInfoProvider" ],
from: "#feedback",
to: "#ui",
},
{
protocol: [
"fuchsia.settings.Accessibility",
"fuchsia.settings.Keyboard",
],
protocol: [ "fuchsia.settings.Keyboard" ],
from: "#setui_service",
to: "#ui",
},
Expand All @@ -104,51 +32,7 @@
to: "#ui",
},
{
protocol: [ "fuchsia.stash.Store" ],
from: "#stash",
to: "#ui",
},
{
protocol: [ "fuchsia.sysmem.Allocator" ],
from: "#sysmem_connector",
to: "#ui",
},
{
protocol: [ "fuchsia.vulkan.loader.Loader" ],
from: "#vulkan_loader",
to: "#ui",
},
{
protocol: [
"fuchsia.accessibility.gesture.ListenerRegistry",
"fuchsia.accessibility.semantics.SemanticsManager",
"fuchsia.accessibility.tts.EngineRegistry",
"fuchsia.accessibility.tts.TtsManager",
"fuchsia.accessibility.virtualkeyboard.Registry",
"fuchsia.input.virtualkeyboard.ControllerCreator",
"fuchsia.input.virtualkeyboard.Manager",
"fuchsia.recovery.policy.Device",
"fuchsia.recovery.ui.FactoryResetCountdown",
"fuchsia.session.scene.Manager",
"fuchsia.ui.brightness.ColorAdjustmentHandler",
"fuchsia.ui.composition.Allocator",
"fuchsia.ui.composition.Flatland",
"fuchsia.ui.composition.internal.ScreenCapture",
"fuchsia.ui.composition.ScreenCapture",
"fuchsia.ui.composition.Screenshot",
"fuchsia.ui.display.singleton.Info",
"fuchsia.ui.focus.FocusChainListenerRegistry",
"fuchsia.ui.input.ImeService",
"fuchsia.ui.input3.Keyboard",
"fuchsia.ui.input3.KeyEventInjector",
"fuchsia.ui.keyboard.focus.Controller",
"fuchsia.ui.pointer.augment.GlobalMouse",
"fuchsia.ui.pointerinjector.Registry",
"fuchsia.ui.policy.DeviceListenerRegistry",
"fuchsia.ui.policy.DisplayBacklight",
"fuchsia.ui.scenic.Scenic",
"fuchsia.ui.views.ViewRefInstalled",
],
protocol: [ "fuchsia.session.scene.Manager" ],
from: "#ui",
to: "#session-manager",
},
Expand All @@ -158,35 +42,5 @@
to: "#session-manager",
availability: "optional",
},
{
directory: "config-data",
from: "parent",
to: "#ui",
},
{
directory: "dev",
from: "parent",
as: "dev-display-controller",
to: [ "#ui" ],
subdir: "class/display-controller",
},
{
directory: "dev",
from: "parent",
as: "dev-input-report",
to: [ "#ui" ],
subdir: "class/input-report",
},
{
storage: [ "tmp" ],
from: "self",
to: "#ui",
},
{
protocol: [ "fuchsia.media.ProfileProvider" ],
from: "#audio_core",
to: "#ui",
source_availability: "unknown",
},
],
}
Loading

0 comments on commit 753f051

Please sign in to comment.