chromium/src
0
Fork 0
Code Activity

[Fuchsia] Rename default_fuchsia_build_dir_for_installation into

Browse Source 
`default_fuchsia_out_dir`

Rename `default_fuchsia_build_dir_for_installation` into
`default_fuchsia_out_dir`, to avoid confusion.

Bug: 1350283
Change-Id: Ib7d74acfbabba9f0d7e83783281bda8dd8ec16be
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4420555
Reviewed-by: Zijie He <zijiehe@google.com>
Auto-Submit: Ho Cheung <uioptt24@gmail.com>
Commit-Queue: Zijie He <zijiehe@google.com>
Cr-Commit-Position: refs/heads/main@{#1130571}
This commit is contained in:
Ho Cheung
2023-04-14 18:27:41 +00:00
committed by Chromium LUCI CQ
parent 251fd88257
commit 2180edfe41
2 changed files with 9 additions and 10 deletions
build/config/fuchsia
generate_runner_scripts.gni
docs/fuchsia
build_instructions.md

17
build/config/fuchsia/generate_runner_scripts.gni

@ -15,7 +15,7 @@ declare_args() {
# Sets the Fuchsia Amber repository which will be used by default by the
# generated installation scripts. If not specified, then no default directory
# will be used.
default_fuchsia_build_dir_for_installation = ""
default_fuchsia_out_dir = ""
# Sets the Fuchsia device node name which will be used by default by the
# generated runner scripts. If not specficed, then no default node name will
@ -62,9 +62,8 @@ declare_args() {
# --package - the path to a .FAR package to install.
# --package_name - the name of the package to use as an
# entry point.
# include_fuchsia_build_dir: If true, adds
# |default_fuchsia_build_dir_for_installation|
# to executable_args (when set in GN args).
# include_fuchsia_out_dir: If true, adds |default_fuchsia_out_dir|
# to executable_args (when set in GN args).
template("fuchsia_run_script_with_packages") {
if (defined(invoker.package_name)) {
_pkg_shortname = invoker.package_name
@ -82,7 +81,7 @@ template("fuchsia_run_script_with_packages") {
"executable",
"executable_args",
"data",
"include_fuchsia_build_dir",
"include_fuchsia_out_dir",
"target",
])
@ -127,11 +126,11 @@ template("fuchsia_run_script_with_packages") {
executable_args = []
}
if (defined(include_fuchsia_build_dir) && include_fuchsia_build_dir &&
default_fuchsia_build_dir_for_installation != "") {
if (defined(include_fuchsia_out_dir) && include_fuchsia_out_dir &&
default_fuchsia_out_dir != "") {
executable_args += [
"--fuchsia-out-dir",
default_fuchsia_build_dir_for_installation,
default_fuchsia_out_dir,
]
}
}
@ -175,7 +174,7 @@ template("fuchsia_package_installer") {
pkg_shortname,
]
output_name_format = "deploy_%package%"
include_fuchsia_build_dir = true
include_fuchsia_out_dir = true
}
}

2
docs/fuchsia/build_instructions.md

@ -276,7 +276,7 @@ Documentation for the underlying testing scripts work can be found
If you have a Fuchsia checkout and build, there are GN arguments in Chromium
that make working with both Fuchsia and Chromium checkouts easier.
* `default_fuchsia_build_dir_for_installation`. Point this to an output
* `default_fuchsia_out_dir`. Point this to an output
directory in Fuchsia. For instance. `/path/to/src/fuchsia/out/qemu-x64`. This
will automatically add the `--fuchsia-out-dir` flag to wrapper scripts.
* `default_fuchsia_device_node_name`. Set this to a Fuchsia device node name.