diff options
author | scottmg <scottmg@chromium.org> | 2014-12-01 16:25:20 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-12-02 00:25:35 +0000 |
commit | b199254f481c5db36d56e83fce40594b06d2b81f (patch) | |
tree | 750cbec5b7f5e15d78cddb158b856012a20f49c5 /build/compiled_action.gni | |
parent | fb49bffb2e0bd0f9a9e0ee5982d6a0ecf5b1dc6f (diff) | |
download | chromium_src-b199254f481c5db36d56e83fce40594b06d2b81f.zip chromium_src-b199254f481c5db36d56e83fce40594b06d2b81f.tar.gz chromium_src-b199254f481c5db36d56e83fce40594b06d2b81f.tar.bz2 |
gn format //build
A starting point for doing all of src, and adding a PRESUBMIT.
Includes https://codereview.chromium.org/772663002/ and https://codereview.chromium.org/770053002/.
I haven't pushed new binaries yet.
Generated via:
> cd build
> git ls-files *.gn *.gni | sed -e "s/^/@..\\\\out\\\\Debug\\\\gn format --in-place /" >x.bat && x.bat
The only things that I don't love in the current output are:
1. Turning
args = [
"--depfile", rebase_path(depfile, root_build_dir),
"--android-sdk-tools", rebased_android_sdk_build_tools,
"--dex-path", rebased_output,
]
into:
args = [
"--depfile",
rebase_path(depfile, root_build_dir),
"--android-sdk-tools",
rebased_android_sdk_build_tools,
"--dex-path",
rebased_output,
]
The heuristic for this isn't trivial though, and it also affects e.g. '-Xclang' in cflags, as well
as assignments to temporaries that are later assigned to args.
2. Turning single line
if (defined(invoker.inputs)) { inputs = invoker.inputs }
into
if (defined(invoker.inputs)) {
inputs = invoker.inputs
}
This could be argued to be an improvement, but as it's very boilerplate-y perhaps an exception to
allow single line in this case is worthwhile. I think there was discussion of new syntax for this
case too, something like "inputs ?= invoker.inputs" maybe.
In both cases, I think it's worthwhile to get formatting turned on, and then go back and special
case these if we decide it's worthwhile.
R=brettw@chromium.org
BUG=348474
Review URL: https://codereview.chromium.org/766573003
Cr-Commit-Position: refs/heads/master@{#306305}
Diffstat (limited to 'build/compiled_action.gni')
-rw-r--r-- | build/compiled_action.gni | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/build/compiled_action.gni b/build/compiled_action.gni index b750af0..e5059aa 100644 --- a/build/compiled_action.gni +++ b/build/compiled_action.gni @@ -102,22 +102,23 @@ template("compiled_action") { # If that's not the case, we'll need another argument to the script to # specify this, since we can't know what the output name is (it might be in # another file not processed yet). - host_executable = get_label_info(host_tool, "root_out_dir") + "/" + - get_label_info(host_tool, "name") + _host_executable_suffix + host_executable = + get_label_info(host_tool, "root_out_dir") + "/" + + get_label_info(host_tool, "name") + _host_executable_suffix # Add the executable itself as an input. inputs += [ host_executable ] - deps = [ host_tool ] + deps = [ + host_tool, + ] if (defined(invoker.deps)) { deps += invoker.deps } # The script takes as arguments the binary to run, and then the arguments # to pass it. - args = [ - rebase_path(host_executable, root_build_dir) - ] + invoker.args + args = [ rebase_path(host_executable, root_build_dir) ] + invoker.args } } @@ -151,21 +152,22 @@ template("compiled_action_foreach") { # If that's not the case, we'll need another argument to the script to # specify this, since we can't know what the output name is (it might be in # another file not processed yet). - host_executable = get_label_info(host_tool, "root_out_dir") + "/" + - get_label_info(host_tool, "name") + _host_executable_suffix + host_executable = + get_label_info(host_tool, "root_out_dir") + "/" + + get_label_info(host_tool, "name") + _host_executable_suffix # Add the executable itself as an input. inputs += [ host_executable ] - deps = [ host_tool ] + deps = [ + host_tool, + ] if (defined(invoker.deps)) { deps += invoker.deps } # The script takes as arguments the binary to run, and then the arguments # to pass it. - args = [ - rebase_path(host_executable, root_build_dir) - ] + invoker.args + args = [ rebase_path(host_executable, root_build_dir) ] + invoker.args } } |