From 91de8eabaaa2c1af6707ff2f2ad9eeec93000c9f Mon Sep 17 00:00:00 2001
From: Gwen Mittertreiner <gwen.mittertreiner@gmail.com>
Date: Tue, 11 Jul 2023 13:24:06 -0700
Subject: [PATCH] [fuchsia][cml] Mark Tracing as Optional
 (flutter/engine#43567)

Tracing is an optional component that is only included in eng builds, so the usage should be marked optional.

Bug: fxbug.dev/112433
---
 .../platform/fuchsia/dart_runner/meta/common.shard.cml     | 6 ++++++
 .../shell/platform/fuchsia/flutter/meta/common.shard.cml   | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/engine/src/flutter/shell/platform/fuchsia/dart_runner/meta/common.shard.cml b/engine/src/flutter/shell/platform/fuchsia/dart_runner/meta/common.shard.cml
index 6d092b70325..0aad02e063b 100644
--- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/meta/common.shard.cml
+++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/meta/common.shard.cml
@@ -32,9 +32,15 @@
                 "fuchsia.logger.LogSink",  // For syslog
                 "fuchsia.net.name.Lookup",  // For fdio sockets
                 "fuchsia.posix.socket.Provider",  // For fdio sockets
+            ],
+            from: "parent",
+        },
+        {
+            protocol: [
                 "fuchsia.tracing.provider.Registry",  // For trace-provider
             ],
             from: "parent",
+            availability: "optional",
         },
     ],
     expose: [
diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/meta/common.shard.cml b/engine/src/flutter/shell/platform/fuchsia/flutter/meta/common.shard.cml
index eb25807c860..5e93f1ed7ad 100644
--- a/engine/src/flutter/shell/platform/fuchsia/flutter/meta/common.shard.cml
+++ b/engine/src/flutter/shell/platform/fuchsia/flutter/meta/common.shard.cml
@@ -42,7 +42,6 @@
                 "fuchsia.net.name.Lookup",
                 "fuchsia.posix.socket.Provider",
                 "fuchsia.sysmem.Allocator",
-                "fuchsia.tracing.provider.Registry", // Copied from vulkan/client.shard.cml.
                 "fuchsia.ui.composition.Allocator",
                 "fuchsia.ui.composition.Flatland",
                 "fuchsia.ui.input.ImeService",
@@ -52,6 +51,12 @@
                 "fuchsia.vulkan.loader.Loader", // Copied from vulkan/client.shard.cml.
             ],
         },
+        {
+            protocol: [
+                "fuchsia.tracing.provider.Registry", // Copied from vulkan/client.shard.cml.
+            ],
+            availability: "optional",
+        },
     ],
     expose: [
         // Required for inspect.