chromium/src
0
Fork 0
Code Activity

Reformat all gn files in /cloud_print.

Browse Source 
`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=thestig@chromium.org

Bug: 1041419
Change-Id: I0b827f00ff7f2468fc53fbecee6edaa1a602bd68
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1998727
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#731439}
This commit is contained in:
Nico Weber
2020-01-14 16:33:45 +00:00
committed by Commit Bot
parent 07c62f2402
commit a7c9940aa5
4 changed files with 20 additions and 60 deletions
cloud_print
BUILD.gn
common
BUILD.gn
virtual_driver
win
install
BUILD.gn
port_monitor
BUILD.gn

4
cloud_print/BUILD.gn

@@ -25,9 +25,7 @@ group("cloud_print") {
} }
test("cloud_print_unittests") { test("cloud_print_unittests") {
sources = [ sources = [ "virtual_driver/win/port_monitor/port_monitor_unittest.cc" ]
"virtual_driver/win/port_monitor/port_monitor_unittest.cc",
]
deps = [ deps = [
"//base", "//base",

4
cloud_print/common/BUILD.gn

@@ -8,9 +8,7 @@ source_set("common") {
"win/cloud_print_utils.h", "win/cloud_print_utils.h",
] ]
deps = [ deps = [ "//base" ]
"//base",
]
} }
source_set("install_utils") { source_set("install_utils") {

24
cloud_print/virtual_driver/win/install/BUILD.gn

@@ -8,9 +8,7 @@ import("//tools/grit/grit_rule.gni")
assert(is_win) assert(is_win)
executable("virtual_driver_setup") { executable("virtual_driver_setup") {
sources = [ sources = [ "setup.cc" ]
"setup.cc",
]
configs -= [ "//build/config/win:console" ] configs -= [ "//build/config/win:console" ]
configs += [ "//build/config/win:windowed" ] configs += [ "//build/config/win:windowed" ]
@@ -31,27 +29,17 @@ executable("virtual_driver_setup") {
} }
copy("copy_gcp_driver_gpd") { copy("copy_gcp_driver_gpd") {
sources = [ sources = [ "inf/gcp_driver.gpd" ]
"inf/gcp_driver.gpd", outputs = [ "$root_build_dir/gcp_driver.gpd" ]
]
outputs = [
"$root_build_dir/gcp_driver.gpd",
]
} }
copy("copy_gcp_driver_inf") { copy("copy_gcp_driver_inf") {
sources = [ sources = [ "inf/gcp_driver.inf" ]
"inf/gcp_driver.inf", outputs = [ "$root_build_dir/gcp_driver.inf" ]
]
outputs = [
"$root_build_dir/gcp_driver.inf",
]
} }
process_version_rc_template("setup_version") { process_version_rc_template("setup_version") {
sources = [ sources = [ "virtual_driver_setup_exe.ver" ]
"virtual_driver_setup_exe.ver",
]
output = "$target_gen_dir/virtual_driver_setup.rc" output = "$target_gen_dir/virtual_driver_setup.rc"
} }

48
cloud_print/virtual_driver/win/port_monitor/BUILD.gn

@@ -8,9 +8,7 @@ import("//chrome/process_version_rc_template.gni")
assert(is_win) assert(is_win)
group("port_monitor") { group("port_monitor") {
public_deps = [ public_deps = [ ":port_monitor_dll" ]
":port_monitor_dll",
]
} }
shared_library("port_monitor_dll") { shared_library("port_monitor_dll") {
@@ -38,9 +36,7 @@ shared_library("port_monitor_dll") {
} }
group("copy_gcp_portmon_binaries") { group("copy_gcp_portmon_binaries") {
deps = [ deps = [ ":copy_gcp_portmon_dll" ]
":copy_gcp_portmon_dll",
]
# TODO(pastarmovj): Find some way to reference the pdb file for the 64bit dll # TODO(pastarmovj): Find some way to reference the pdb file for the 64bit dll
# simply using it in the sources directive causes gn to error when generating # simply using it in the sources directive causes gn to error when generating
# the build files. # the build files.
@@ -48,15 +44,9 @@ group("copy_gcp_portmon_binaries") {
if (current_cpu == "x64") { if (current_cpu == "x64") {
copy("copy_gcp_portmon_dll") { copy("copy_gcp_portmon_dll") {
sources = [ sources = [ "$root_out_dir/gcp_portmon64.dll" ]
"$root_out_dir/gcp_portmon64.dll", outputs = [ "$root_out_dir/gcp_portmon.dll" ]
] deps = [ ":port_monitor_dll" ]
outputs = [
"$root_out_dir/gcp_portmon.dll",
]
deps = [
":port_monitor_dll",
]
} }
} else { } else {
# Make sure that we have a copy of gcp_portmon64.dll in the root out # Make sure that we have a copy of gcp_portmon64.dll in the root out
@@ -73,27 +63,15 @@ if (current_cpu == "x64") {
if (symbol_level > 0) { if (symbol_level > 0) {
copy("copy_gcp_portmon_pdb") { copy("copy_gcp_portmon_pdb") {
visibility = [ ":copy_gcp_portmon_dll" ] visibility = [ ":copy_gcp_portmon_dll" ]
sources = [ sources = [ "$gcp_portmon64_out_dir/gcp_portmon64.dll.pdb" ]
"$gcp_portmon64_out_dir/gcp_portmon64.dll.pdb", outputs = [ "$root_out_dir/{{source_file_part}}" ]
] deps = [ gcp_portmon64_label ]
outputs = [
"$root_out_dir/{{source_file_part}}",
]
deps = [
gcp_portmon64_label,
]
} }
} }
copy("copy_gcp_portmon_dll") { copy("copy_gcp_portmon_dll") {
sources = [ sources = [ "$gcp_portmon64_out_dir/gcp_portmon64.dll" ]
"$gcp_portmon64_out_dir/gcp_portmon64.dll", outputs = [ "$root_out_dir/{{source_file_part}}" ]
] deps = [ gcp_portmon64_label ]
outputs = [
"$root_out_dir/{{source_file_part}}",
]
deps = [
gcp_portmon64_label,
]
if (symbol_level > 0) { if (symbol_level > 0) {
deps += [ ":copy_gcp_portmon_pdb" ] deps += [ ":copy_gcp_portmon_pdb" ]
} }
@@ -116,9 +94,7 @@ source_set("lib") {
} }
process_version_rc_template("resources") { process_version_rc_template("resources") {
sources = [ sources = [ "../gcp_portmon_dll.ver" ]
"../gcp_portmon_dll.ver",
]
# Note: target_gen_dir will be different for each toolchain so the output # Note: target_gen_dir will be different for each toolchain so the output
# name doesn't need mangling. # name doesn't need mangling.