Commit 168d04c4 authored by Nico Weber's avatar Nico Weber Committed by Commit Bot

Reformat all gn files in /chrome/updater.

`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=sorin@chromium.org

Bug: 1041419
Change-Id: Ic82a4501826f479afc5e84ac855350bc6d4edf7b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1997716
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarSorin Jianu <sorin@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#732513}
parent 9bce3656
...@@ -10,14 +10,10 @@ import("//testing/test.gni") ...@@ -10,14 +10,10 @@ import("//testing/test.gni")
# TODO(sorin): make the code build on Linux. https://crbug.com/1014320 # TODO(sorin): make the code build on Linux. https://crbug.com/1014320
group("updater") { group("updater") {
if (is_win) { if (is_win) {
deps = [ deps = [ "//chrome/updater/win" ]
"//chrome/updater/win",
]
} }
if (is_mac) { if (is_mac) {
deps = [ deps = [ "//chrome/updater/mac" ]
"//chrome/updater/mac",
]
} }
if (is_win || is_mac) { if (is_win || is_mac) {
deps += [ "//chrome/updater/tools:tools" ] deps += [ "//chrome/updater/tools:tools" ]
...@@ -106,9 +102,7 @@ if (is_win || is_mac) { ...@@ -106,9 +102,7 @@ if (is_win || is_mac) {
"//chrome/updater/win:updater_tests", "//chrome/updater/win:updater_tests",
] ]
data_deps = [ data_deps = [ "//chrome/updater/win:updater" ]
"//chrome/updater/win:updater",
]
} }
if (is_mac) { if (is_mac) {
......
...@@ -29,9 +29,7 @@ source_set("network_fetcher_sources") { ...@@ -29,9 +29,7 @@ source_set("network_fetcher_sources") {
source_set("updater_tests") { source_set("updater_tests") {
testonly = true testonly = true
sources = [ sources = [ "net/network_unittest.mm" ]
"net/network_unittest.mm",
]
deps = [ deps = [
":network_fetcher_sources", ":network_fetcher_sources",
...@@ -47,9 +45,7 @@ mac_app_bundle("updater_bundle") { ...@@ -47,9 +45,7 @@ mac_app_bundle("updater_bundle") {
info_plist = "Info.plist" info_plist = "Info.plist"
output_name = "GoogleUpdate" output_name = "GoogleUpdate"
sources = [ sources = [ "main.cc" ]
"main.cc",
]
deps = [ deps = [
":network_fetcher_sources", ":network_fetcher_sources",
":updater_setup_sources", ":updater_setup_sources",
...@@ -79,9 +75,7 @@ source_set("updater_setup_sources") { ...@@ -79,9 +75,7 @@ source_set("updater_setup_sources") {
} }
executable("updater_setup") { executable("updater_setup") {
sources = [ sources = [ "setup/main.cc" ]
"setup/main.cc",
]
deps = [ deps = [
":updater_bundle", ":updater_bundle",
...@@ -90,10 +84,6 @@ executable("updater_setup") { ...@@ -90,10 +84,6 @@ executable("updater_setup") {
} }
copy("updater_install_script") { copy("updater_install_script") {
sources = [ sources = [ "setup/.install.sh" ]
"setup/.install.sh", outputs = [ "$root_build_dir/chrome/updater/.install.sh" ]
]
outputs = [
"$root_build_dir/chrome/updater/.install.sh",
]
} }
...@@ -5,9 +5,7 @@ ...@@ -5,9 +5,7 @@
import("//testing/test.gni") import("//testing/test.gni")
group("tools") { group("tools") {
deps = [ deps = [ ":certificate_tag" ]
":certificate_tag",
]
} }
source_set("certificate_tag_lib") { source_set("certificate_tag_lib") {
...@@ -20,15 +18,11 @@ source_set("certificate_tag_lib") { ...@@ -20,15 +18,11 @@ source_set("certificate_tag_lib") {
# complete and before closing crbug.com/1031734. # complete and before closing crbug.com/1031734.
cflags_cc = [ "-Wno-unused-const-variable" ] cflags_cc = [ "-Wno-unused-const-variable" ]
deps = [ deps = [ "//base" ]
"//base",
]
} }
executable("certificate_tag") { executable("certificate_tag") {
sources = [ sources = [ "main.cc" ]
"main.cc",
]
deps = [ deps = [
":certificate_tag_lib", ":certificate_tag_lib",
...@@ -39,9 +33,7 @@ executable("certificate_tag") { ...@@ -39,9 +33,7 @@ executable("certificate_tag") {
source_set("unittest") { source_set("unittest") {
testonly = true testonly = true
sources = [ sources = [ "certificate_tag_unittest.cc" ]
"certificate_tag_unittest.cc",
]
deps = [ deps = [
":certificate_tag_lib", ":certificate_tag_lib",
......
...@@ -7,9 +7,7 @@ import("//chrome/process_version_rc_template.gni") ...@@ -7,9 +7,7 @@ import("//chrome/process_version_rc_template.gni")
import("//testing/test.gni") import("//testing/test.gni")
midl("updater_idl_idl") { midl("updater_idl_idl") {
sources = [ sources = [ "com/updater_idl.idl" ]
"com/updater_idl.idl",
]
writes_tlb = true writes_tlb = true
} }
...@@ -55,18 +53,12 @@ executable("updater") { ...@@ -55,18 +53,12 @@ executable("updater") {
} }
copy("uninstall.cmd") { copy("uninstall.cmd") {
sources = [ sources = [ "setup/uninstall.cmd" ]
"setup/uninstall.cmd", outputs = [ "$target_gen_dir/uninstall.cmd" ]
]
outputs = [
"$target_gen_dir/uninstall.cmd",
]
} }
process_version_rc_template("version_resources") { process_version_rc_template("version_resources") {
sources = [ sources = [ "updater.ver" ]
"updater.ver",
]
output = "$target_gen_dir/updater_exe.rc" output = "$target_gen_dir/updater_exe.rc"
} }
...@@ -151,9 +143,7 @@ source_set("install_progress_observer") { ...@@ -151,9 +143,7 @@ source_set("install_progress_observer") {
"install_progress_observer.h", "install_progress_observer.h",
] ]
deps = [ deps = [ "//base" ]
"//base",
]
} }
# This build target is defined to minimize the impact of -Wno-missing-braces # This build target is defined to minimize the impact of -Wno-missing-braces
......
...@@ -41,9 +41,7 @@ process_version_rc_template("version") { ...@@ -41,9 +41,7 @@ process_version_rc_template("version") {
updater_runtime_deps = "$root_gen_dir/updater.runtime_deps" updater_runtime_deps = "$root_gen_dir/updater.runtime_deps"
group("updater_runtime_deps") { group("updater_runtime_deps") {
write_runtime_deps = updater_runtime_deps write_runtime_deps = updater_runtime_deps
data_deps = [ data_deps = [ "//chrome/updater/win:updater" ]
"//chrome/updater/win:updater",
]
} }
template("generate_installer") { template("generate_installer") {
...@@ -57,9 +55,7 @@ template("generate_installer") { ...@@ -57,9 +55,7 @@ template("generate_installer") {
release_file = "updater.release" release_file = "updater.release"
inputs = [ inputs = [ release_file ]
release_file,
]
outputs = [ outputs = [
"$output_dir/updater.packed.7z", "$output_dir/updater.packed.7z",
...@@ -135,9 +131,7 @@ test("installer_unittest") { ...@@ -135,9 +131,7 @@ test("installer_unittest") {
"string_unittest.cc", "string_unittest.cc",
] ]
public_deps = [ public_deps = [ ":lib" ]
":lib",
]
deps = [ deps = [
"//base", "//base",
"//base/test:test_support", "//base/test:test_support",
......
...@@ -39,9 +39,7 @@ source_set("test_executables") { ...@@ -39,9 +39,7 @@ source_set("test_executables") {
"test_executables.h", "test_executables.h",
] ]
data_deps = [ data_deps = [ ":updater_test_process" ]
":updater_test_process",
]
deps = [ deps = [
":test_common", ":test_common",
...@@ -54,9 +52,7 @@ source_set("test_executables") { ...@@ -54,9 +52,7 @@ source_set("test_executables") {
executable("updater_test_process") { executable("updater_test_process") {
testonly = true testonly = true
sources = [ sources = [ "test_process_main.cc" ]
"test_process_main.cc",
]
deps = [ deps = [
":test_common", ":test_common",
......
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