Revert "[graphics] Convert vulkan_loader to components v2"
This reverts commit 726799ac9e458af49c502e8c78a0bdbd11d81011.
Reason for revert: Broke SDK rolls into consumers that used vulkan_loader.cmx.
Original change's description:
> [graphics] Convert vulkan_loader to components v2
>
> This is the first step in loading Vulkan ICDs from packages. After this
> we can modify the loader to launch V2 components that will provide the
> ICD.
>
> Also add the vulkan_loader package to the base packages in core.gni to
> ensure that it will be found properly - it seems like universe packages
> aren't resolved.
>
> Bug: 13078
>
> Change-Id: Ib2f403b7e920dc431a346d8ad8b336f3275b016a
> Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/487139
> Reviewed-by: Bryan Henry <bryanhenry@google.com>
> Reviewed-by: Gary Bressler <geb@google.com>
> Reviewed-by: Craig Stout <cstout@google.com>
> Commit-Queue: John Bauman <jbauman@google.com>
TBR=cstout@google.com,jbauman@google.com,geb@google.com,bryanhenry@google.com
Change-Id: I1a610cfbad2cb1ef6c2df41f964eb414cef16961
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 13078
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/513162
Reviewed-by: John Bauman <jbauman@google.com>
Commit-Queue: John Bauman <jbauman@google.com>
diff --git a/src/graphics/bin/vulkan_loader/BUILD.gn b/src/graphics/bin/vulkan_loader/BUILD.gn
index e5bc6c1..25a5997 100644
--- a/src/graphics/bin/vulkan_loader/BUILD.gn
+++ b/src/graphics/bin/vulkan_loader/BUILD.gn
@@ -24,7 +24,7 @@
fuchsia_component("vulkan_loader_cmp") {
component_name = "vulkan_loader"
deps = [ ":bin" ]
- manifest = "meta/vulkan_loader.cml"
+ manifest = "meta/vulkan_loader.cmx"
}
fuchsia_package("vulkan_loader") {
diff --git a/src/graphics/bin/vulkan_loader/meta/vulkan_loader.cml b/src/graphics/bin/vulkan_loader/meta/vulkan_loader.cml
deleted file mode 100644
index 18e2a11..0000000
--- a/src/graphics/bin/vulkan_loader/meta/vulkan_loader.cml
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- include: [ "sdk/lib/diagnostics/syslog/client.shard.cml" ],
- program: {
- runner: "elf",
- binary: "bin/vulkan_loader",
- },
- capabilities: [
- {
- protocol: [ "fuchsia.vulkan.loader.Loader" ],
- },
- ],
- use: [
- {
- directory: "system-lib",
- rights: [ "rx*" ],
- path: "/system/lib",
- },
- ],
- expose: [
- {
- protocol: "fuchsia.vulkan.loader.Loader",
- from: "self",
- },
- ],
-}
diff --git a/src/graphics/bin/vulkan_loader/meta/vulkan_loader.cmx b/src/graphics/bin/vulkan_loader/meta/vulkan_loader.cmx
new file mode 100644
index 0000000..808684a
--- /dev/null
+++ b/src/graphics/bin/vulkan_loader/meta/vulkan_loader.cmx
@@ -0,0 +1,13 @@
+{
+ "include": [
+ "sdk/lib/diagnostics/syslog/client.shard.cmx"
+ ],
+ "program": {
+ "binary": "bin/vulkan_loader"
+ },
+ "sandbox": {
+ "system": [
+ "lib"
+ ]
+ }
+}
diff --git a/src/security/policy/component_manager_policy.json5 b/src/security/policy/component_manager_policy.json5
index 205e8bc0..b071bb8 100644
--- a/src/security/policy/component_manager_policy.json5
+++ b/src/security/policy/component_manager_policy.json5
@@ -225,7 +225,6 @@
"/bootstrap/netsvc",
"/core",
"/core/appmgr",
- "/core/vulkan_loader",
],
},
{
diff --git a/src/sys/appmgr/meta/appmgr.cml b/src/sys/appmgr/meta/appmgr.cml
index 7ee408e..1bcd34e 100644
--- a/src/sys/appmgr/meta/appmgr.cml
+++ b/src/sys/appmgr/meta/appmgr.cml
@@ -360,10 +360,6 @@
protocol: "fuchsia.stash.SecureStore",
path: "/svc_for_sys/fuchsia.stash.SecureStore",
},
- {
- protocol: "fuchsia.vulkan.loader.Loader",
- path: "/svc_for_sys/fuchsia.vulkan.loader.Loader",
- },
// From archivist
{
diff --git a/src/sys/core/meta/core.cml b/src/sys/core/meta/core.cml
index 1e93a76..7731730 100644
--- a/src/sys/core/meta/core.cml
+++ b/src/sys/core/meta/core.cml
@@ -107,11 +107,6 @@
name: "dhcpd",
url: "fuchsia-pkg://fuchsia.com/dhcpd#meta/dhcpd.cm",
},
- {
- name: "vulkan_loader",
- url: "fuchsia-pkg://fuchsia.com/vulkan_loader#meta/vulkan_loader.cm",
- environment: "#universe-resolver-env",
- },
],
capabilities: [
{
@@ -387,7 +382,6 @@
"#temperature-logger",
"#test_manager",
"#universe-resolver",
- "#vulkan_loader",
],
},
{
@@ -766,18 +760,6 @@
from: "self",
to: [ "#last_reboot" ],
},
- {
- protocol: [ "fuchsia.vulkan.loader.Loader" ],
- from: "#vulkan_loader",
- to: [ "#appmgr" ],
- },
- {
- directory: "system",
- from: "parent",
- as: "system-lib",
- to: [ "#vulkan_loader" ],
- subdir: "lib",
- },
],
expose: [
// Non-zircon services for svchost
diff --git a/src/sys/sysmgr/config/services.config b/src/sys/sysmgr/config/services.config
index 22b3088..a96e4df 100644
--- a/src/sys/sysmgr/config/services.config
+++ b/src/sys/sysmgr/config/services.config
@@ -88,7 +88,8 @@
"fuchsia.ui.scenic.Scenic": "fuchsia-pkg://fuchsia.com/scenic#meta/scenic.cmx",
"fuchsia.ui.scenic.internal.Snapshot": "fuchsia-pkg://fuchsia.com/scenic#meta/scenic.cmx",
"fuchsia.ui.text.TextInputContextLegacy": "fuchsia-pkg://fuchsia.com/ime_service#meta/ime_service.cmx",
- "fuchsia.virtualization.Manager": "fuchsia-pkg://fuchsia.com/guest_manager#meta/guest_manager.cmx"
+ "fuchsia.virtualization.Manager": "fuchsia-pkg://fuchsia.com/guest_manager#meta/guest_manager.cmx",
+ "fuchsia.vulkan.loader.Loader": "fuchsia-pkg://fuchsia.com/vulkan_loader#meta/vulkan_loader.cmx"
},
"optional_services": [
"fuchsia.ui.activity.Provider",
