chromium/src
0
Fork 0
Code Activity

[fuchsia] Directly publish the output package to its final location.

Browse Source 
This skips a file copy.
Bug: 973159

Change-Id: Idb3883c7afec3ad1b6725ff0b47f9640c3bc8c19
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1776608
Commit-Queue: Fabrice de Gans-Riberi <fdegans@chromium.org>
Reviewed-by: Kevin Marshall <kmarshall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#691867}
This commit is contained in:
Fabrice de Gans-Riberi
2019-08-30 00:08:59 +00:00
committed by Commit Bot
parent 4e8f4a6164
commit 0c7e87fad7
1 changed files with 14 additions and 36 deletions

50
build/config/fuchsia/package.gni

@ -40,13 +40,12 @@ template("fuchsia_package") {
_build_ids_file = "$_pkg_out_dir/ids.txt"
_component_manifest = "$_pkg_out_dir/${pkg.package_name}.cmx"
_meta_far_file = "$_pkg_out_dir/meta.far"
_combined_far_file = "$_pkg_out_dir/${pkg.package_name}-0.far"
_final_far_file = "$_pkg_out_dir/${pkg.package_name}.far"
_package_far_file = "$_pkg_out_dir/${pkg.package_name}"
_package_far_file_with_suffix = "${_package_far_file}.far"
_package_info_path = "$_pkg_out_dir/package"
_write_manifest_target = "${pkg.package_name}__write_manifest"
_package_target = "${pkg.package_name}__pkg"
_bundle_target = "${pkg.package_name}__bundle"
# Generates a manifest file based on the GN runtime deps
# suitable for "pm" tool consumption.
@ -145,7 +144,7 @@ template("fuchsia_package") {
}
# Creates a package containing the metadata archive and blob data.
action(_bundle_target) {
action(target_name) {
forward_variables_from(invoker, [ "testonly" ])
script = "//build/gn_run_binary.py"
@ -163,7 +162,15 @@ template("fuchsia_package") {
]
outputs = [
_combined_far_file,
_package_far_file_with_suffix,
]
data = [
_package_far_file_with_suffix,
# Files specified here so that they can be read by isolated testbots.
_package_info_path,
_build_ids_file,
]
args = [
@ -173,37 +180,8 @@ template("fuchsia_package") {
"-m",
rebase_path(_archive_manifest, root_build_dir),
"archive",
]
}
# Copies the archive to a well-known path.
# TODO(kmarshall): Use a 'pm' output flag to write directly to the desired
# file path instead.
copy(target_name) {
forward_variables_from(invoker, [ "testonly" ])
# Allows dependent targets to make use of "ids.txt".
public_deps = [
":$_write_manifest_target",
]
deps = [
":$_bundle_target",
]
data = [
_final_far_file,
# Files specified here so that they can be read by isolated testbots.
_package_info_path,
_build_ids_file,
]
sources = [
_combined_far_file,
]
outputs = [
_final_far_file,
"-output",
rebase_path(_package_far_file, root_build_dir),
]
}
}