commit e9518f2b70c8ab229994143463b545ccb53c13b3
author John Bauman <jbauman@google.com> Wed Oct 16 17:35:46 2019 -0700
committer John Bauman <jbauman@google.com> Wed Oct 16 17:35:46 2019 -0700
tree ec2bef396e0cc3ae13569fcdfee0193400bcca05
parent 1d59a1ae9ed98e34f7d6a6c9694689a9b8683e69

Convert from injected to system services (part 2)

Bug: 4506
Change-Id: I1fd0f9a842d70eade9db62e7a57e13227310dafa

fuchsia/meta/vulkan-cts-1.0.2.cmx

diff --git a/fuchsia/meta/vulkan-cts-1.0.2.cmx b/fuchsia/meta/vulkan-cts-1.0.2.cmx
index 0bf273c..606fe1f 100644
--- a/fuchsia/meta/vulkan-cts-1.0.2.cmx
+++ b/fuchsia/meta/vulkan-cts-1.0.2.cmx
@@ -1,10 +1,10 @@
 {
     "facets": {
         "fuchsia.test": {
-            "injected-services": {
-                "fuchsia.sysmem.Allocator": "fuchsia-pkg://fuchsia.com/sysmem_connector#meta/sysmem_connector.cmx",
-                "fuchsia.vulkan.loader.Loader": "fuchsia-pkg://fuchsia.com/vulkan_loader#meta/vulkan_loader.cmx"
-            }
+            "system-services": [
+                "fuchsia.sysmem.Allocator",
+                "fuchsia.vulkan.loader.Loader"
+            ]
         }
     },
     "program": {

fuchsia/meta/vulkan-cts-no-args.cmx

diff --git a/fuchsia/meta/vulkan-cts-no-args.cmx b/fuchsia/meta/vulkan-cts-no-args.cmx
index cd257db..ca8646b 100644
--- a/fuchsia/meta/vulkan-cts-no-args.cmx
+++ b/fuchsia/meta/vulkan-cts-no-args.cmx
@@ -1,10 +1,10 @@
 {
     "facets": {
         "fuchsia.test": {
-            "injected-services": {
-                "fuchsia.sysmem.Allocator": "fuchsia-pkg://fuchsia.com/sysmem_connector#meta/sysmem_connector.cmx",
-                "fuchsia.vulkan.loader.Loader": "fuchsia-pkg://fuchsia.com/vulkan_loader#meta/vulkan_loader.cmx"
-            }
+            "system-services": [
+                "fuchsia.sysmem.Allocator",
+                "fuchsia.vulkan.loader.Loader"
+            ]
         }
     },
     "program": {

fuchsia/meta/vulkan-cts.cmx

diff --git a/fuchsia/meta/vulkan-cts.cmx b/fuchsia/meta/vulkan-cts.cmx
index 484f94e..2cba71c 100644
--- a/fuchsia/meta/vulkan-cts.cmx
+++ b/fuchsia/meta/vulkan-cts.cmx
@@ -1,10 +1,10 @@
 {
     "facets": {
         "fuchsia.test": {
-            "injected-services": {
-                "fuchsia.sysmem.Allocator": "fuchsia-pkg://fuchsia.com/sysmem_connector#meta/sysmem_connector.cmx",
-                "fuchsia.vulkan.loader.Loader": "fuchsia-pkg://fuchsia.com/vulkan_loader#meta/vulkan_loader.cmx"
-            }
+            "system-services": [
+                "fuchsia.sysmem.Allocator",
+                "fuchsia.vulkan.loader.Loader"
+            ]
         }
     },
     "program": {