Commit fcf30419 authored by yuanzhi's avatar yuanzhi Committed by Commit Bot

[Fuchsia] Add option to change fuchsia gn build template to accept install_mode configuration.

Bug: TEST-851
Change-Id: I7646f3902793811b81ad2a6c4b3807603536c603
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1737726Reviewed-by: default avatarKevin Marshall <kmarshall@chromium.org>
Reviewed-by: default avatarFabrice de Gans-Riberi <fdegans@chromium.org>
Commit-Queue: Yuan Zhi <yuanzhi@google.com>
Cr-Commit-Position: refs/heads/master@{#685407}
parent c7315fdd
...@@ -57,6 +57,7 @@ process_version("build_id") { ...@@ -57,6 +57,7 @@ process_version("build_id") {
# cipd_path: The path where the package will be located inside the CIPD # cipd_path: The path where the package will be located inside the CIPD
# repository. # repository.
# cipd_description: Sets the "description" field in CIPD metadata. # cipd_description: Sets the "description" field in CIPD metadata.
# install_mode: String, should be either "symlink" or "copy".
# deps: A list of targets to build prior to copying files. # deps: A list of targets to build prior to copying files.
# sources: A list of files to copy into the staging root. # sources: A list of files to copy into the staging root.
template("cipd_archive") { template("cipd_archive") {
...@@ -65,15 +66,21 @@ template("cipd_archive") { ...@@ -65,15 +66,21 @@ template("cipd_archive") {
"cipd_manifest_name", "cipd_manifest_name",
"cipd_path", "cipd_path",
"cipd_description", "cipd_description",
"install_mode",
"deps", "deps",
"sources", "sources",
]) ])
archive_staging_dir = "${target_gen_dir}/${target_name}" archive_staging_dir = "${target_gen_dir}/${target_name}"
if (!defined(invoker.install_mode)) {
install_mode = "symlink"
}
assert(install_mode == "copy" || install_mode == "symlink",
"\"install_mode\" arg should be either \"copy\" or \"symlink\".")
yaml_contents = [ yaml_contents = [
"package: ${cipd_path}", "package: ${cipd_path}",
"description: ${cipd_description}", "description: ${cipd_description}",
"root: \${outdir}/" + rebase_path(archive_staging_dir, root_build_dir), "root: \${outdir}/" + rebase_path(archive_staging_dir, root_build_dir),
"install_mode: ${install_mode}",
"data:", "data:",
" - file: LICENSE", " - file: LICENSE",
] ]
...@@ -178,7 +185,7 @@ cipd_archive("chromedriver") { ...@@ -178,7 +185,7 @@ cipd_archive("chromedriver") {
cipd_manifest_name = "chromedriver.yaml" cipd_manifest_name = "chromedriver.yaml"
cipd_path = "chromium/fuchsia/chromedriver/\${os}-\${arch}" cipd_path = "chromium/fuchsia/chromedriver/\${os}-\${arch}"
cipd_description = "Prebuilt Chromedriver binary for Fuchsia host." cipd_description = "Prebuilt Chromedriver binary for Fuchsia host."
install_mode = "copy"
deps = [ deps = [
":strip_chromedriver_binary", ":strip_chromedriver_binary",
] ]
......
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