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
4 changes: 4 additions & 0 deletions tools/fuchsia/fuchsia_archive.gni
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ template("fuchsia_archive") {
testonly = pkg_testonly
}

manifest_json_file = "${root_out_dir}/${target_name}_package_manifest.json"
action(target_name) {
script = "//flutter/tools/fuchsia/gen_package.py"
deps = pkg_dir_deps + [
Expand All @@ -116,8 +117,11 @@ template("fuchsia_archive") {
rebase_path("//flutter/tools/fuchsia/development.key"),
"--far-name",
target_name,
"--manifest-json-file",
rebase_path(manifest_json_file, root_build_dir),
]
outputs = [
manifest_json_file,
"${far_base_dir}.manifest",
"$root_out_dir/${target_name}-0.far",
]
Expand Down
7 changes: 6 additions & 1 deletion tools/fuchsia/gen_package.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ def main():
'--signing-key', dest='signing_key', action='store', required=True)
parser.add_argument(
'--manifest-file', dest='manifest_file', action='store', required=False)
parser.add_argument(
'--manifest-json-file', dest='manifest_json_file', action='store', required=True)
parser.add_argument(
'--far-name', dest='far_name', action='store', required=False)

Expand Down Expand Up @@ -89,6 +91,8 @@ def main():
args.pm_bin,
'-o',
output_dir,
'-n',
args.far_name,
'-k',
args.signing_key,
'-m',
Expand All @@ -98,8 +102,9 @@ def main():
# Build and then archive the package
# Use check_output so if anything goes wrong we get the output.
try:

pm_commands = [
['build'],
['build', '--output-package-manifest', args.manifest_json_file],
['archive', '--output='+ os.path.join(os.path.dirname(output_dir), args.far_name + "-0")],
]
for pm_command in pm_commands:
Expand Down