Commit aa9fcfb2 authored by Kevin Marshall's avatar Kevin Marshall Committed by Commit Bot

Fuchsia: Add component manifest to write_manifest target outputs.

(Addressing post-landing feedback on CL 1093396.)

Adds the .cmx output file to the action "outputs" list.

TBR=sergeyu@chromium.org

Change-Id: Iddbba07661054fd213f5f04cc776587533a3c637
Reviewed-on: https://chromium-review.googlesource.com/1093698
Commit-Queue: Kevin Marshall <kmarshall@chromium.org>
Reviewed-by: default avatarKevin Marshall <kmarshall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#565767}
parent 302db475
...@@ -24,7 +24,8 @@ template("package") { ...@@ -24,7 +24,8 @@ template("package") {
_pkg_out_dir = "$root_out_dir/gen/" + get_label_info(pkg.package_name, "dir") _pkg_out_dir = "$root_out_dir/gen/" + get_label_info(pkg.package_name, "dir")
_runtime_deps_file = "$_pkg_out_dir/${pkg.package_name}.runtime_deps" _runtime_deps_file = "$_pkg_out_dir/${pkg.package_name}.runtime_deps"
_manifest_file = "$_pkg_out_dir/${pkg.package_name}.archive_manifest" _archive_manifest = "$_pkg_out_dir/${pkg.package_name}.archive_manifest"
_component_manifest = "$_pkg_out_dir/${pkg.package_name}.cmx"
_key_file = "$_pkg_out_dir/signing-key" _key_file = "$_pkg_out_dir/signing-key"
_meta_far_file = "$_pkg_out_dir/meta.far" _meta_far_file = "$_pkg_out_dir/meta.far"
_combined_far_file = "$_pkg_out_dir/${pkg.package_name}-0.far" _combined_far_file = "$_pkg_out_dir/${pkg.package_name}-0.far"
...@@ -55,7 +56,8 @@ template("package") { ...@@ -55,7 +56,8 @@ template("package") {
] ]
outputs = [ outputs = [
_manifest_file, _archive_manifest,
_component_manifest,
] ]
data_deps = pkg.deps data_deps = pkg.deps
...@@ -73,7 +75,7 @@ template("package") { ...@@ -73,7 +75,7 @@ template("package") {
rebase_path(_runtime_deps_file), rebase_path(_runtime_deps_file),
rebase_path(_depfile), rebase_path(_depfile),
rebase_path(dist_libroot) + "," + rebase_path("${sysroot}/dist"), rebase_path(dist_libroot) + "," + rebase_path("${sysroot}/dist"),
rebase_path(_manifest_file), rebase_path(_archive_manifest),
] ]
write_runtime_deps = _runtime_deps_file write_runtime_deps = _runtime_deps_file
...@@ -123,7 +125,7 @@ template("package") { ...@@ -123,7 +125,7 @@ template("package") {
"-k", "-k",
rebase_path(_key_file), rebase_path(_key_file),
"-m", "-m",
rebase_path(_manifest_file), rebase_path(_archive_manifest),
"build", "build",
] ]
} }
...@@ -141,7 +143,7 @@ template("package") { ...@@ -141,7 +143,7 @@ template("package") {
inputs = [ inputs = [
_meta_far_file, _meta_far_file,
_manifest_file, _archive_manifest,
] ]
outputs = [ outputs = [
...@@ -153,7 +155,7 @@ template("package") { ...@@ -153,7 +155,7 @@ template("package") {
"-o", "-o",
rebase_path(_pkg_out_dir), rebase_path(_pkg_out_dir),
"-m", "-m",
rebase_path(_manifest_file), rebase_path(_archive_manifest),
"archive", "archive",
] ]
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment