diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter index 1d5cee942105c..eb0d510e1831a 100755 --- a/ci/licenses_golden/licenses_flutter +++ b/ci/licenses_golden/licenses_flutter @@ -1380,9 +1380,14 @@ FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/logging.h FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/main.cc FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/aot_product_runtime FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/aot_runtime +FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/common.shard.cml +FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_aot_product_runner.cml FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_aot_product_runner.cmx +FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_aot_runner.cml FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_aot_runner.cmx +FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_jit_product_runner.cml FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_jit_product_runner.cmx +FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_jit_runner.cml FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_jit_runner.cmx FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_zircon_test.cmx FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/jit_product_runtime diff --git a/shell/platform/fuchsia/dart_runner/meta/common.shard.cml b/shell/platform/fuchsia/dart_runner/meta/common.shard.cml new file mode 100644 index 0000000000000..60c0474fe3aff --- /dev/null +++ b/shell/platform/fuchsia/dart_runner/meta/common.shard.cml @@ -0,0 +1,38 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. +{ + capabilities: [ + { + directory: "diagnostics", + rights: [ "connect" ], + path: "/diagnostics", + }, + ], + use: [ + { + directory: "config-data", + rights: [ "r*" ], + path: "/config/data", + }, + { + protocol: [ + "fuchsia.component.runner.ComponentRunner", + "fuchsia.deprecatedtimezone.Timezone", + "fuchsia.feedback.CrashReporter", + "fuchsia.intl.PropertyProvider", + "fuchsia.logger.LogSink", + "fuchsia.posix.socket.Provider", + "fuchsia.tracing.provider.Registry", + ], + from: "parent", + }, + ], + expose: [ + { + directory: "diagnostics", + from: "self", + to: "framework", + }, + ], +} diff --git a/shell/platform/fuchsia/dart_runner/meta/dart_aot_product_runner.cml b/shell/platform/fuchsia/dart_runner/meta/dart_aot_product_runner.cml new file mode 100644 index 0000000000000..5f3e58cea8ff4 --- /dev/null +++ b/shell/platform/fuchsia/dart_runner/meta/dart_aot_product_runner.cml @@ -0,0 +1,24 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. +{ + include: [ "common.shard.cml" ], + program: { + runner: "elf", + binary: "bin/app", + forward_stdout_to: "log", + forward_stderr_to: "log", + }, + capabilities: [ + { + runner: "dart_aot_product_runner", + path: "/svc/fuchsia.component.runner.ComponentRunner", + }, + ], + expose: [ + { + runner: "dart_aot_product_runner", + from: "self", + }, + ], +} diff --git a/shell/platform/fuchsia/dart_runner/meta/dart_aot_runner.cml b/shell/platform/fuchsia/dart_runner/meta/dart_aot_runner.cml new file mode 100644 index 0000000000000..d884ba849fc38 --- /dev/null +++ b/shell/platform/fuchsia/dart_runner/meta/dart_aot_runner.cml @@ -0,0 +1,24 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. +{ + include: [ "common.shard.cml" ], + program: { + runner: "elf", + binary: "bin/app", + forward_stdout_to: "log", + forward_stderr_to: "log", + }, + capabilities: [ + { + runner: "dart_aot_runner", + path: "/svc/fuchsia.component.runner.ComponentRunner", + }, + ], + expose: [ + { + runner: "dart_aot_runner", + from: "self", + }, + ], +} diff --git a/shell/platform/fuchsia/dart_runner/meta/dart_jit_product_runner.cml b/shell/platform/fuchsia/dart_runner/meta/dart_jit_product_runner.cml new file mode 100644 index 0000000000000..8dadc78b24f43 --- /dev/null +++ b/shell/platform/fuchsia/dart_runner/meta/dart_jit_product_runner.cml @@ -0,0 +1,26 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. +{ + include: [ "common.shard.cml" ], + program: { + runner: "elf", + binary: "bin/app", + forward_stdout_to: "log", + forward_stderr_to: "log", + // needed for JIT builds + job_policy_ambient_mark_vmo_exec: "true", + }, + capabilities: [ + { + runner: "dart_jit_product_runner", + path: "/svc/fuchsia.component.runner.ComponentRunner", + }, + ], + expose: [ + { + runner: "dart_jit_product_runner", + from: "self", + }, + ], +} diff --git a/shell/platform/fuchsia/dart_runner/meta/dart_jit_runner.cml b/shell/platform/fuchsia/dart_runner/meta/dart_jit_runner.cml new file mode 100644 index 0000000000000..6304f182da124 --- /dev/null +++ b/shell/platform/fuchsia/dart_runner/meta/dart_jit_runner.cml @@ -0,0 +1,26 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. +{ + include: [ "common.shard.cml" ], + program: { + runner: "elf", + binary: "bin/app", + forward_stdout_to: "log", + forward_stderr_to: "log", + // needed for JIT builds + job_policy_ambient_mark_vmo_exec: "true", + }, + capabilities: [ + { + runner: "dart_jit_runner", + path: "/svc/fuchsia.component.runner.ComponentRunner", + }, + ], + expose: [ + { + runner: "dart_jit_runner", + from: "self", + }, + ], +} diff --git a/tools/fuchsia/devshell/serve.sh b/tools/fuchsia/devshell/serve.sh index a3e3601284010..07d389a13f64c 100755 --- a/tools/fuchsia/devshell/serve.sh +++ b/tools/fuchsia/devshell/serve.sh @@ -205,6 +205,22 @@ while true; do \"host_match\": \"fuchsia.com\", \"host_replacement\": \"engine\", \"path_prefix_match\": \"/flutter_aot_runner\", \"path_prefix_replacement\": \"/flutter_aot_runner\" }, + { + \"host_match\": \"fuchsia.com\", \"host_replacement\": \"engine\", + \"path_prefix_match\": \"/dart_jit_runner/\", \"path_prefix_replacement\": \"/dart_jit_runner/\" + }, + { + \"host_match\": \"fuchsia.com\", \"host_replacement\": \"engine\", + \"path_prefix_match\": \"/dart_jit_runner\", \"path_prefix_replacement\": \"/dart_jit_runner\" + }, + { + \"host_match\": \"fuchsia.com\", \"host_replacement\": \"engine\", + \"path_prefix_match\": \"/dart_aot_runner/\", \"path_prefix_replacement\": \"/dart_aot_runner/\" + }, + { + \"host_match\": \"fuchsia.com\", \"host_replacement\": \"engine\", + \"path_prefix_match\": \"/dart_aot_runner\", \"path_prefix_replacement\": \"/dart_aot_runner\" + }, { \"host_match\": \"fuchsia.com\", \"host_replacement\": \"devhost\", \"path_prefix_match\": \"/\", \"path_prefix_replacement\": \"/\"