Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ci/licenses_golden/licenses_flutter
Original file line number Diff line number Diff line change
Expand Up @@ -1462,9 +1462,14 @@ FILE: ../../../flutter/shell/platform/fuchsia/flutter/logging.h
FILE: ../../../flutter/shell/platform/fuchsia/flutter/main.cc
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/aot_product_runtime
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/aot_runtime
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/common.shard.cml
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_product_runner.cml
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_product_runner.cmx
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_runner.cml
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_runner.cmx
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_product_runner.cml
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_product_runner.cmx
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_runner.cml
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_runner.cmx
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_runner_tests.cmx
FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/jit_product_runtime
Expand Down
6 changes: 6 additions & 0 deletions shell/platform/fuchsia/dart_runner/meta/common.shard.cml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
// found in the LICENSE file.
{
capabilities: [
// Required for inspect.
// Copied from inspect/client.shard.cml because out-of-tree doesn't
// have support for CML includes from the SDK.
{
directory: "diagnostics",
rights: [ "connect" ],
Expand Down Expand Up @@ -30,6 +33,9 @@
},
],
expose: [
// Required for inspect.
// Copied from inspect/client.shard.cml because out-of-tree doesn't
// have support for CML includes from the SDK.
{
directory: "diagnostics",
from: "self",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
binary: "bin/app",
forward_stdout_to: "log",
forward_stderr_to: "log",
// needed for JIT builds
// Needed for JIT builds.
job_policy_ambient_mark_vmo_exec: "true",
},
capabilities: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
binary: "bin/app",
forward_stdout_to: "log",
forward_stderr_to: "log",
// needed for JIT builds
// Needed for JIT builds.
job_policy_ambient_mark_vmo_exec: "true",
},
capabilities: [
Expand Down
2 changes: 2 additions & 0 deletions shell/platform/fuchsia/flutter/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,7 @@ template("jit_runner") {
binary = "flutter_jit${product_suffix}_runner"

cmx_file = rebase_path("meta/flutter_jit${product_suffix}_runner.cmx")
cml_file = rebase_path("meta/flutter_jit${product_suffix}_runner.cml")

resources = [
{
Expand Down Expand Up @@ -394,6 +395,7 @@ template("aot_runner") {
}

cmx_file = rebase_path("meta/flutter_aot${product_suffix}_runner.cmx")
cml_file = rebase_path("meta/flutter_aot${product_suffix}_runner.cml")

binary = "flutter_aot${product_suffix}_runner"

Expand Down
53 changes: 53 additions & 0 deletions shell/platform/fuchsia/flutter/meta/common.shard.cml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
// 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: [
// Required for inspect.
// Copied from inspect/client.shard.cml because out-of-tree doesn't
// have support for CML includes from the SDK.
{

directory: "diagnostics",
rights: [ "connect" ],
path: "/diagnostics",
},
],
expose: [
// Required for inspect.
// Copied from inspect/client.shard.cml because out-of-tree doesn't
// have support for CML includes from the SDK.
{
directory: "diagnostics",
from: "self",
to: "framework",
},
],
use: [
{
directory: "config-data",
rights: [ "r*" ],
path: "/config/data",
},
{
protocol: [
"fuchsia.accessibility.SettingsManager",
"fuchsia.accessibility.semantics.SemanticsManager",
"fuchsia.deprecatedtimezone.Timezone",
"fuchsia.device.NameProvider",
"fuchsia.feedback.CrashReporter",
"fuchsia.fonts.Provider",
"fuchsia.intl.PropertyProvider",
"fuchsia.logger.LogSink", // Copied from syslog/client.shard.cml.
"fuchsia.net.name.Lookup",
"fuchsia.posix.socket.Provider",
"fuchsia.sysmem.Allocator",
"fuchsia.timezone.Timezone", // Copied from vulkan/client.shard.cml.
"fuchsia.tracing.provider.Registry", // Copied from vulkan/client.shard.cml.
"fuchsia.ui.composition.Allocator",
"fuchsia.ui.composition.Flatland",
"fuchsia.vulkan.loader.Loader" // Copied from vulkan/client.shard.cml.
]
}
]
}
24 changes: 24 additions & 0 deletions shell/platform/fuchsia/flutter/meta/flutter_aot_product_runner.cml
Original file line number Diff line number Diff line change
@@ -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: "flutter_aot_product_runner",
path: "/svc/fuchsia.component.runner.ComponentRunner",
},
],
expose: [
{
runner: "flutter_aot_product_runner",
from: "self",
},
],
}
24 changes: 24 additions & 0 deletions shell/platform/fuchsia/flutter/meta/flutter_aot_runner.cml
Original file line number Diff line number Diff line change
@@ -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: "flutter_aot_runner",
path: "/svc/fuchsia.component.runner.ComponentRunner",
},
],
expose: [
{
runner: "flutter_aot_runner",
from: "self",
},
],
}
26 changes: 26 additions & 0 deletions shell/platform/fuchsia/flutter/meta/flutter_jit_product_runner.cml
Original file line number Diff line number Diff line change
@@ -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: "flutter_jit_product_runner",
path: "/svc/fuchsia.component.runner.ComponentRunner",
},
],
expose: [
{
runner: "flutter_jit_product_runner",
from: "self",
},
],
}
26 changes: 26 additions & 0 deletions shell/platform/fuchsia/flutter/meta/flutter_jit_runner.cml
Original file line number Diff line number Diff line change
@@ -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: "flutter_jit_runner",
path: "/svc/fuchsia.component.runner.ComponentRunner",
},
],
expose: [
{
runner: "flutter_jit_runner",
from: "self",
},
],
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"program": {
"binary": "bin/app",
"env_vars": [
"ICU_TIMEZONE_FILES_DIR=/pkg/data/tzdata"
"ICU_TIMEZONE_FILES_DIR=/pkg/data/tzdata"
]
},
"facets": {
Expand Down