Reformat all gn files in /third_party/yasm. `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=dalecurtis@chromium.org Bug: 1041419 Change-Id: Ie028bb68b57fb36845f4825459257be95b848685 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1998270 Auto-Submit: Nico Weber <thakis@chromium.org> Reviewed-by: Dale Curtis <dalecurtis@chromium.org> Commit-Queue: Dale Curtis <dalecurtis@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#730981} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: e40615e804b986ce70c41c5b65d7eed28a3323d5
diff --git a/BUILD.gn b/BUILD.gn index 6e245fe..c6543a5 100644 --- a/BUILD.gn +++ b/BUILD.gn
@@ -88,9 +88,7 @@ } executable("genmacro") { - sources = [ - "source/patched-yasm/tools/genmacro/genmacro.c", - ] + sources = [ "source/patched-yasm/tools/genmacro/genmacro.c" ] configs -= [ "//build/config/compiler:chromium_code" ] configs += [ ":yasm_config", @@ -103,9 +101,7 @@ } executable("genmodule") { - sources = [ - "source/patched-yasm/libyasm/genmodule.c", - ] + sources = [ "source/patched-yasm/libyasm/genmodule.c" ] configs -= [ "//build/config/compiler:chromium_code" ] configs += [ ":yasm_config", @@ -161,9 +157,7 @@ } executable("genstring") { - sources = [ - "source/patched-yasm/genstring.c", - ] + sources = [ "source/patched-yasm/genstring.c" ] configs -= [ "//build/config/compiler:chromium_code" ] configs += [ ":yasm_config", @@ -176,9 +170,7 @@ } executable("genversion") { - sources = [ - "source/patched-yasm/modules/preprocs/nasm/genversion.c", - ] + sources = [ "source/patched-yasm/modules/preprocs/nasm/genversion.c" ] configs -= [ "//build/config/compiler:chromium_code" ] configs += [ ":yasm_config", @@ -391,9 +383,7 @@ "source/patched-yasm/modules/arch/x86/x86regtmod.gperf", ] - outputs = [ - "$target_gen_dir/{{source_name_part}}.c", - ] + outputs = [ "$target_gen_dir/{{source_name_part}}.c" ] args = [ "{{source}}", rebase_path(target_gen_dir, root_build_dir) + "/{{source_name_part}}.c", @@ -414,9 +404,7 @@ "source/patched-yasm/x86insn_nasm.gperf", ] - outputs = [ - "$yasm_gen_include_dir/{{source_name_part}}.c", - ] + outputs = [ "$yasm_gen_include_dir/{{source_name_part}}.c" ] args = [ "{{source}}", rebase_path(yasm_gen_include_dir, root_build_dir) + @@ -445,49 +433,31 @@ compile_macro("compile_nasm_macros") { # Output #included by # source/patched-yasm/modules/preprocs/nasm/nasm-parser.c - sources = [ - "source/patched-yasm/modules/parsers/nasm/nasm-std.mac", - ] - outputs = [ - "$yasm_gen_include_dir/nasm-macros.c", - ] + sources = [ "source/patched-yasm/modules/parsers/nasm/nasm-std.mac" ] + outputs = [ "$yasm_gen_include_dir/nasm-macros.c" ] macro_varname = "nasm_standard_mac" } compile_macro("compile_nasm_version") { # Output #included by # source/patched-yasm/modules/preprocs/nasm/nasm-preproc.c - sources = [ - "$target_gen_dir/$version_file", - ] - outputs = [ - "$yasm_gen_include_dir/nasm-version.c", - ] + sources = [ "$target_gen_dir/$version_file" ] + outputs = [ "$yasm_gen_include_dir/nasm-version.c" ] macro_varname = "nasm_version_mac" - deps = [ - ":generate_version", - ] + deps = [ ":generate_version" ] } compile_macro("compile_win64_gas") { # Output #included by source/patched-yasm/frontends/yasm/yasm.c. - sources = [ - "source/patched-yasm/modules/objfmts/coff/win64-gas.mac", - ] - outputs = [ - "$yasm_gen_include_dir/win64-gas.c", - ] + sources = [ "source/patched-yasm/modules/objfmts/coff/win64-gas.mac" ] + outputs = [ "$yasm_gen_include_dir/win64-gas.c" ] macro_varname = "win64_gas_stdmac" } compile_macro("compile_win64_nasm") { # Output #included by source/patched-yasm/frontends/yasm/yasm.c. - sources = [ - "source/patched-yasm/modules/objfmts/coff/win64-nasm.mac", - ] - outputs = [ - "$yasm_gen_include_dir/win64-nasm.c", - ] + sources = [ "source/patched-yasm/modules/objfmts/coff/win64-nasm.mac" ] + outputs = [ "$yasm_gen_include_dir/win64-nasm.c" ] macro_varname = "win64_nasm_stdmac" } @@ -497,9 +467,7 @@ "source/patched-yasm/modules/parsers/gas/gas-token.re", "source/patched-yasm/modules/parsers/nasm/nasm-token.re", ] - outputs = [ - "$target_gen_dir/{{source_name_part}}.c", - ] + outputs = [ "$target_gen_dir/{{source_name_part}}.c" ] args = [ "-b", "-o", @@ -511,12 +479,8 @@ # This call doesn't fit into the re2c template above. compiled_action("compile_re2c_lc3b") { tool = ":re2c" - inputs = [ - "source/patched-yasm/modules/arch/lc3b/lc3bid.re", - ] - outputs = [ - "$target_gen_dir/lc3bid.c", - ] + inputs = [ "source/patched-yasm/modules/arch/lc3b/lc3bid.re" ] + outputs = [ "$target_gen_dir/lc3bid.c" ] args = [ "-s", "-o", @@ -529,12 +493,8 @@ tool = ":genstring" # Output #included by source/patched-yasm/frontends/yasm/yasm.c. - inputs = [ - "source/patched-yasm/COPYING", - ] - outputs = [ - "$yasm_gen_include_dir/license.c", - ] + inputs = [ "source/patched-yasm/COPYING" ] + outputs = [ "$yasm_gen_include_dir/license.c" ] args = [ "license_msg", rebase_path(outputs[0], root_build_dir), @@ -548,9 +508,7 @@ "source/patched-yasm/libyasm/module.in", config_makefile, ] - outputs = [ - "$target_gen_dir/module.c", - ] + outputs = [ "$target_gen_dir/module.c" ] args = [ rebase_path(inputs[0], root_build_dir), rebase_path(config_makefile, root_build_dir), @@ -560,9 +518,7 @@ compiled_action("generate_version") { tool = ":genversion" - outputs = [ - "$target_gen_dir/$version_file", - ] + outputs = [ "$target_gen_dir/$version_file" ] args = [ rebase_path(outputs[0], root_build_dir) ] } }
diff --git a/yasm_assemble.gni b/yasm_assemble.gni index f94fa6b..9deddd0 100644 --- a/yasm_assemble.gni +++ b/yasm_assemble.gni
@@ -123,9 +123,7 @@ root_build_dir) ] # Deps. - deps = [ - yasm_label, - ] + deps = [ yasm_label ] if (defined(invoker.deps)) { deps += invoker.deps } @@ -165,9 +163,7 @@ } # Output file. - outputs = [ - "$target_out_dir/$source_set_name/{{source_name_part}}.o", - ] + outputs = [ "$target_out_dir/$source_set_name/{{source_name_part}}.o" ] args += [ "-o", rebase_path(outputs[0], root_build_dir), @@ -192,8 +188,6 @@ # Do not publicize any header to remove build dependency. public = [] - deps = [ - ":$action_name", - ] + deps = [ ":$action_name" ] } }