Reformat all gn files in /build.
`gn format` recently changed its formatting behavior for deps, source, and a few other elements when they are assigned (with =) single-element lists to be consistent with the formatting of updates (with +=) with single-element. Now that we've rolled in a GN binary with the change, reformat all files so that people don't get presubmit warnings due to this. This CL was uploaded by git cl split. R=tikuta@chromium.org Bug: 1041419 Change-Id: I15bd43c6df0ba87f879e5226e4dbb1af7ba73f03 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1998745 Auto-Submit: Nico Weber <thakis@chromium.org> Reviewed-by: Takuto Ikuta <tikuta@chromium.org> Commit-Queue: Takuto Ikuta <tikuta@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#731078} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 4782d7368c37ae35cf0c44456ba8307079a4d24e
This commit is contained in:
Родитель
744bccece3
Коммит
1ab8b1afa1
4
BUILD.gn
4
BUILD.gn
|
@ -7,9 +7,7 @@ import("//build/config/chrome_build.gni")
|
|||
import("//build/config/chromecast_build.gni")
|
||||
|
||||
source_set("buildflag_header_h") {
|
||||
sources = [
|
||||
"buildflag.h",
|
||||
]
|
||||
sources = [ "buildflag.h" ]
|
||||
}
|
||||
|
||||
buildflag_header("branding_buildflags") {
|
||||
|
|
|
@ -104,9 +104,7 @@ template("buildflag_header") {
|
|||
header_file = rebase_path(".", "//") + "/${invoker.header}"
|
||||
}
|
||||
|
||||
outputs = [
|
||||
"$root_gen_dir/$header_file",
|
||||
]
|
||||
outputs = [ "$root_gen_dir/$header_file" ]
|
||||
|
||||
# Always write --flags to the file so it's not empty. Empty will confuse GN
|
||||
# into thinking the response file isn't used.
|
||||
|
@ -134,8 +132,6 @@ template("buildflag_header") {
|
|||
"visibility",
|
||||
])
|
||||
|
||||
public_deps = [
|
||||
"//build:buildflag_header_h",
|
||||
]
|
||||
public_deps = [ "//build:buildflag_header_h" ]
|
||||
}
|
||||
}
|
||||
|
|
|
@ -82,9 +82,7 @@ if (enable_nocompile_tests) {
|
|||
|
||||
result_path = "$target_gen_dir/{{source_name_part}}_nc.cc"
|
||||
depfile = "${result_path}.d"
|
||||
outputs = [
|
||||
result_path,
|
||||
]
|
||||
outputs = [ result_path ]
|
||||
args = [
|
||||
rebase_path("$clang_base_path/bin/clang++", root_build_dir),
|
||||
"4", # number of compilers to invoke in parallel.
|
||||
|
|
|
@ -71,20 +71,15 @@ template("partitioned_shared_library") {
|
|||
|
||||
template("partition_action") {
|
||||
action(target_name) {
|
||||
deps = [
|
||||
":$_combined_library_target",
|
||||
]
|
||||
deps = [ ":$_combined_library_target" ]
|
||||
script = "//build/extract_partition.py"
|
||||
sources = [
|
||||
"$root_out_dir/lib.unstripped/lib${_output_name}__combined.so",
|
||||
]
|
||||
sources =
|
||||
[ "$root_out_dir/lib.unstripped/lib${_output_name}__combined.so" ]
|
||||
outputs = [
|
||||
invoker.unstripped_output,
|
||||
invoker.stripped_output,
|
||||
]
|
||||
data = [
|
||||
invoker.unstripped_output,
|
||||
]
|
||||
data = [ invoker.unstripped_output ]
|
||||
metadata = {
|
||||
shared_libraries = [ invoker.stripped_output ]
|
||||
}
|
||||
|
|
|
@ -33,9 +33,7 @@ template("shim_headers") {
|
|||
}
|
||||
|
||||
group(target_name) {
|
||||
deps = [
|
||||
":${action_name}",
|
||||
]
|
||||
deps = [ ":${action_name}" ]
|
||||
all_dependent_configs = [ ":${config_name}" ]
|
||||
}
|
||||
}
|
||||
|
|
12
symlink.gni
12
symlink.gni
|
@ -15,9 +15,7 @@ template("symlink") {
|
|||
"testonly",
|
||||
"visibility",
|
||||
])
|
||||
outputs = [
|
||||
invoker.output,
|
||||
]
|
||||
outputs = [ invoker.output ]
|
||||
script = "//build/symlink.py"
|
||||
args = [
|
||||
"-f",
|
||||
|
@ -58,12 +56,8 @@ template("binary_symlink") {
|
|||
"testonly",
|
||||
"visibility",
|
||||
])
|
||||
deps = [
|
||||
invoker.binary_label,
|
||||
]
|
||||
data_deps = [
|
||||
invoker.binary_label,
|
||||
]
|
||||
deps = [ invoker.binary_label ]
|
||||
data_deps = [ invoker.binary_label ]
|
||||
if (defined(invoker.data_deps)) {
|
||||
data_deps += invoker.data_deps
|
||||
}
|
||||
|
|
|
@ -14,9 +14,7 @@ action("webkit_version") {
|
|||
]
|
||||
|
||||
output_file = "$target_gen_dir/webkit_version.h"
|
||||
outputs = [
|
||||
output_file,
|
||||
]
|
||||
outputs = [ output_file ]
|
||||
|
||||
args = [
|
||||
# LASTCHANGE contains "<build hash>-<ref>". The user agent only wants the
|
||||
|
@ -33,13 +31,9 @@ action("webkit_version") {
|
|||
action("chrome_version_json") {
|
||||
script = "version.py"
|
||||
_chrome_version_path = "//chrome/VERSION"
|
||||
inputs = [
|
||||
_chrome_version_path,
|
||||
]
|
||||
inputs = [ _chrome_version_path ]
|
||||
_output_file = "$root_gen_dir/CHROME_VERSION.json"
|
||||
outputs = [
|
||||
_output_file,
|
||||
]
|
||||
outputs = [ _output_file ]
|
||||
args = [
|
||||
"--file",
|
||||
rebase_path(_chrome_version_path, root_build_dir),
|
||||
|
|
|
@ -70,9 +70,7 @@ template("generate_wrapper") {
|
|||
data = []
|
||||
}
|
||||
data += [ _wrapper_script ]
|
||||
outputs = [
|
||||
_wrapper_script,
|
||||
]
|
||||
outputs = [ _wrapper_script ]
|
||||
|
||||
_rebased_executable_to_wrap =
|
||||
rebase_path(_executable_to_wrap, root_build_dir)
|
||||
|
|
|
@ -22,9 +22,7 @@ template("java_action") {
|
|||
action(target_name) {
|
||||
script = jarrunner
|
||||
|
||||
inputs = [
|
||||
jarscript,
|
||||
]
|
||||
inputs = [ jarscript ]
|
||||
if (defined(invoker.inputs)) {
|
||||
inputs += invoker.inputs
|
||||
}
|
||||
|
@ -72,9 +70,7 @@ template("java_action_foreach") {
|
|||
action_foreach(target_name) {
|
||||
script = jarrunner
|
||||
|
||||
inputs = [
|
||||
jarscript,
|
||||
]
|
||||
inputs = [ jarscript ]
|
||||
if (defined(invoker.inputs)) {
|
||||
inputs += invoker.inputs
|
||||
}
|
||||
|
|
|
@ -72,9 +72,7 @@ template("process_version") {
|
|||
inputs += [ invoker.template_file ]
|
||||
}
|
||||
|
||||
outputs = [
|
||||
invoker.output,
|
||||
]
|
||||
outputs = [ invoker.output ]
|
||||
|
||||
args = []
|
||||
|
||||
|
@ -118,9 +116,7 @@ template("process_version") {
|
|||
source_set(source_set_name) {
|
||||
forward_variables_from(invoker, [ "visibility" ])
|
||||
sources = get_target_outputs(":$action_name")
|
||||
public_deps = [
|
||||
":$action_name",
|
||||
]
|
||||
public_deps = [ ":$action_name" ]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -81,9 +81,7 @@ template("message_compiler") {
|
|||
source_set(source_set_name) {
|
||||
forward_variables_from(invoker, [ "visibility" ])
|
||||
sources = get_target_outputs(":$action_name")
|
||||
deps = [
|
||||
":$action_name",
|
||||
]
|
||||
deps = [ ":$action_name" ]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче