Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 5d60bd2

Browse files
chinmaygardechinmaygarde
authored
Apply formatter to all GN files. (#775)
There is no CI hook to check formatting of .gn and .gni files in the buildroot. Applies the formatter to all files with no change in behavior. The same actions were done on the engine and all files were correctly formatted already which proves the auto-formatter is working there.
1 parent af04b54 commit 5d60bd2

17 files changed

Lines changed: 83 additions & 125 deletions

File tree

‎build/compiled_action.gni‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ template("compiled_action") {
8989
"pool",
9090
"outputs",
9191
])
92-
92+
9393
script = "//build/gn_run_binary.py"
9494

9595
if (defined(invoker.inputs)) {

‎build/config/android/rules.gni‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@
44

55
# TODO(dnfield): Patch icu to not depend on this file
66
import("//build/config/android/config.gni")
7-
87
assert(is_android)

‎build/config/arm.gni‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if (current_cpu == "arm" || current_cpu == "arm64") {
88
# platforms.
99
if (current_cpu == "arm") {
1010
arm_version = 7
11-
} else if(current_cpu == "arm64") {
11+
} else if (current_cpu == "arm64") {
1212
arm_version = 8
1313
} else {
1414
assert(false, "Unconfigured arm version")

‎build/config/compiler/BUILD.gn‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -872,9 +872,7 @@ if (is_win) {
872872
} else {
873873
common_optimize_on_ldflags += [ "-Wl,-O2" ]
874874
}
875-
common_optimize_on_ldflags += [
876-
"-Wl,--gc-sections",
877-
]
875+
common_optimize_on_ldflags += [ "-Wl,--gc-sections" ]
878876

879877
if (!using_sanitizer && !is_wasm) {
880878
# Functions interposed by the sanitizers can make ld think
@@ -977,7 +975,7 @@ config("symbols") {
977975
ldflags = [ "-g3" ]
978976
} else {
979977
cflags = [ "-gsource-map" ]
980-
ldflags = [ "-gsource-map"]
978+
ldflags = [ "-gsource-map" ]
981979
}
982980
} else {
983981
cflags = [ "-g2" ]

‎build/config/mac/rules.gni‎

Lines changed: 14 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,13 @@ template("code_sign_mac") {
1212
assert(defined(invoker.deps))
1313

1414
action(target_name) {
15-
sources = [
16-
invoker.entitlements_path,
17-
]
15+
sources = [ invoker.entitlements_path ]
1816

1917
_application_path = invoker.application_path
2018

2119
script = mac_app_script
2220

23-
outputs = [
24-
"$_application_path/_CodeSignature/CodeResources",
25-
]
21+
outputs = [ "$_application_path/_CodeSignature/CodeResources" ]
2622

2723
args = [
2824
"codesign",
@@ -51,9 +47,7 @@ template("resource_copy_mac") {
5147

5248
copy(target_name) {
5349
sources = _resources
54-
outputs = [
55-
"$root_build_dir/$_app_name.app/$_bundle_directory/Contents/Resources/{{source_file_part}}",
56-
]
50+
outputs = [ "$root_build_dir/$_app_name.app/$_bundle_directory/Contents/Resources/{{source_file_part}}" ]
5751

5852
if (defined(invoker.deps)) {
5953
deps = invoker.deps
@@ -80,9 +74,7 @@ template("mac_app") {
8074
script = mac_app_script
8175

8276
sources = []
83-
outputs = [
84-
"$root_build_dir/$app_name.app",
85-
]
77+
outputs = [ "$root_build_dir/$app_name.app" ]
8678

8779
args = [
8880
"structure",
@@ -109,12 +101,8 @@ template("mac_app") {
109101
action(plist_gen_target_name) {
110102
script = mac_app_script
111103

112-
sources = [
113-
invoker.info_plist,
114-
]
115-
outputs = [
116-
"$root_build_dir/plist/$app_name/Info.plist",
117-
]
104+
sources = [ invoker.info_plist ]
105+
outputs = [ "$root_build_dir/plist/$app_name/Info.plist" ]
118106

119107
args = [
120108
"plist",
@@ -129,32 +117,21 @@ template("mac_app") {
129117

130118
copy_plist_gen_target_name = target_name + "_plist_copy"
131119
copy(copy_plist_gen_target_name) {
132-
sources = [
133-
"$root_build_dir/plist/$app_name/Info.plist",
134-
]
120+
sources = [ "$root_build_dir/plist/$app_name/Info.plist" ]
135121

136-
outputs = [
137-
"$root_build_dir/$app_name.app/Contents/{{source_file_part}}",
138-
]
122+
outputs = [ "$root_build_dir/$app_name.app/Contents/{{source_file_part}}" ]
139123

140-
deps = [
141-
":$plist_gen_target_name",
142-
]
124+
deps = [ ":$plist_gen_target_name" ]
143125
}
144126

145127
copy_bin_target_name = target_name + "_bin_copy"
146128
copy(copy_bin_target_name) {
147-
sources = [
148-
"$root_build_dir/$app_name",
149-
]
129+
sources = [ "$root_build_dir/$app_name" ]
150130

151-
outputs = [
152-
"$root_build_dir/$app_name.app/Contents/MacOS/{{source_file_part}}",
153-
]
131+
outputs =
132+
[ "$root_build_dir/$app_name.app/Contents/MacOS/{{source_file_part}}" ]
154133

155-
deps = [
156-
":$bin_gen_target_name",
157-
]
134+
deps = [ ":$bin_gen_target_name" ]
158135
}
159136

160137
copy_all_target_name = target_name + "_all_copy"
@@ -169,8 +146,6 @@ template("mac_app") {
169146
# Top level group
170147

171148
group(target_name) {
172-
deps = [
173-
":$copy_all_target_name",
174-
]
149+
deps = [ ":$copy_all_target_name" ]
175150
}
176151
}

‎build/config/sysroot.gni‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ if (current_toolchain == default_toolchain && target_sysroot != "") {
2525
} else if (is_linux && !is_chromeos) {
2626
if (use_default_linux_sysroot && !is_fuchsia) {
2727
if (current_cpu == "x64") {
28-
sysroot = rebase_path("//build/linux/debian_sid_amd64-sysroot", root_build_dir)
28+
sysroot =
29+
rebase_path("//build/linux/debian_sid_amd64-sysroot", root_build_dir)
2930
} else {
30-
sysroot = rebase_path("//build/linux/debian_sid_arm64-sysroot", root_build_dir)
31+
sysroot =
32+
rebase_path("//build/linux/debian_sid_arm64-sysroot", root_build_dir)
3133
}
3234
assert(
3335
exec_script("//build/dir_exists.py", [ sysroot ], "string") == "True",

‎build/config/templates/templates.gni‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ template("file_template") {
3636
script = "//build/android/gyp/jinja_template.py"
3737
depfile = "$target_gen_dir/$target_name.d"
3838

39-
sources = [
40-
invoker.input,
41-
]
39+
sources = [ invoker.input ]
4240
outputs = [
4341
invoker.output,
4442
depfile,

‎build/secondary/third_party/glfw/glfw_args.gni‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
# found in the LICENSE file.
44

55
declare_args() {
6-
glfw_vulkan_library=""
6+
glfw_vulkan_library = ""
77
}

‎build/secondary/third_party/vulkan_validation_layers/BUILD.gn‎

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -105,27 +105,27 @@ config("vulkan_layer_config") {
105105
}
106106

107107
core_validation_sources = [
108-
"$_checkout_dir/layers/utils/android_ndk_types.h",
109-
"$_checkout_dir/layers/utils/convert_to_renderpass2.cpp",
110-
"$_checkout_dir/layers/utils/convert_to_renderpass2.h",
108+
"$_checkout_dir/layers/containers/qfo_transfer.h",
109+
"$_checkout_dir/layers/containers/range_vector.h",
110+
"$_checkout_dir/layers/containers/subresource_adapter.cpp",
111+
"$_checkout_dir/layers/containers/subresource_adapter.h",
111112
"$_checkout_dir/layers/core_checks/cc_android.cpp",
112113
"$_checkout_dir/layers/core_checks/cc_buffer.cpp",
113114
"$_checkout_dir/layers/core_checks/cc_buffer_address.h",
114-
"$_checkout_dir/layers/core_checks/cc_cmd_buffer_dynamic.cpp",
115115
"$_checkout_dir/layers/core_checks/cc_cmd_buffer.cpp",
116+
"$_checkout_dir/layers/core_checks/cc_cmd_buffer_dynamic.cpp",
116117
"$_checkout_dir/layers/core_checks/cc_copy_blit_resolve.cpp",
117-
"$_checkout_dir/layers/core_checks/core_validation.h",
118118
"$_checkout_dir/layers/core_checks/cc_descriptor.cpp",
119-
"$_checkout_dir/layers/core_checks/cc_device_memory.cpp",
120119
"$_checkout_dir/layers/core_checks/cc_device.cpp",
120+
"$_checkout_dir/layers/core_checks/cc_device_memory.cpp",
121121
"$_checkout_dir/layers/core_checks/cc_drawdispatch.cpp",
122122
"$_checkout_dir/layers/core_checks/cc_external_object.cpp",
123123
"$_checkout_dir/layers/core_checks/cc_image.cpp",
124124
"$_checkout_dir/layers/core_checks/cc_image_layout.cpp",
125+
"$_checkout_dir/layers/core_checks/cc_pipeline.cpp",
125126
"$_checkout_dir/layers/core_checks/cc_pipeline_compute.cpp",
126127
"$_checkout_dir/layers/core_checks/cc_pipeline_graphics.cpp",
127128
"$_checkout_dir/layers/core_checks/cc_pipeline_ray_tracing.cpp",
128-
"$_checkout_dir/layers/core_checks/cc_pipeline.cpp",
129129
"$_checkout_dir/layers/core_checks/cc_query.cpp",
130130
"$_checkout_dir/layers/core_checks/cc_queue.cpp",
131131
"$_checkout_dir/layers/core_checks/cc_ray_tracing.cpp",
@@ -136,6 +136,7 @@ core_validation_sources = [
136136
"$_checkout_dir/layers/core_checks/cc_video.cpp",
137137
"$_checkout_dir/layers/core_checks/cc_wsi.cpp",
138138
"$_checkout_dir/layers/core_checks/cc_ycbcr.cpp",
139+
"$_checkout_dir/layers/core_checks/core_validation.h",
139140
"$_checkout_dir/layers/error_message/core_error_location.cpp",
140141
"$_checkout_dir/layers/error_message/core_error_location.h",
141142
"$_checkout_dir/layers/error_message/validation_error_enums.h",
@@ -158,8 +159,6 @@ core_validation_sources = [
158159
"$_checkout_dir/layers/gpu_validation/gpu_validation.cpp",
159160
"$_checkout_dir/layers/gpu_validation/gpu_validation.h",
160161
"$_checkout_dir/layers/gpu_validation/gpu_vuids.h",
161-
"$_checkout_dir/layers/containers/qfo_transfer.h",
162-
"$_checkout_dir/layers/containers/range_vector.h",
163162
"$_checkout_dir/layers/state_tracker/base_node.cpp",
164163
"$_checkout_dir/layers/state_tracker/base_node.h",
165164
"$_checkout_dir/layers/state_tracker/buffer_state.cpp",
@@ -188,22 +187,23 @@ core_validation_sources = [
188187
"$_checkout_dir/layers/state_tracker/render_pass_state.cpp",
189188
"$_checkout_dir/layers/state_tracker/render_pass_state.h",
190189
"$_checkout_dir/layers/state_tracker/sampler_state.h",
191-
"$_checkout_dir/layers/state_tracker/shader_module.cpp",
192-
"$_checkout_dir/layers/state_tracker/shader_module.h",
193190
"$_checkout_dir/layers/state_tracker/shader_instruction.cpp",
194191
"$_checkout_dir/layers/state_tracker/shader_instruction.h",
192+
"$_checkout_dir/layers/state_tracker/shader_module.cpp",
193+
"$_checkout_dir/layers/state_tracker/shader_module.h",
195194
"$_checkout_dir/layers/state_tracker/state_tracker.cpp",
196195
"$_checkout_dir/layers/state_tracker/state_tracker.h",
197196
"$_checkout_dir/layers/state_tracker/video_session_state.cpp",
198197
"$_checkout_dir/layers/state_tracker/video_session_state.h",
199-
"$_checkout_dir/layers/containers/subresource_adapter.cpp",
200-
"$_checkout_dir/layers/containers/subresource_adapter.h",
201198
"$_checkout_dir/layers/sync/sync_utils.cpp",
202199
"$_checkout_dir/layers/sync/sync_utils.h",
203-
"$_checkout_dir/layers/sync/sync_vuid_maps.cpp",
204-
"$_checkout_dir/layers/sync/sync_vuid_maps.h",
205200
"$_checkout_dir/layers/sync/sync_validation.cpp",
206201
"$_checkout_dir/layers/sync/sync_validation.h",
202+
"$_checkout_dir/layers/sync/sync_vuid_maps.cpp",
203+
"$_checkout_dir/layers/sync/sync_vuid_maps.h",
204+
"$_checkout_dir/layers/utils/android_ndk_types.h",
205+
"$_checkout_dir/layers/utils/convert_to_renderpass2.cpp",
206+
"$_checkout_dir/layers/utils/convert_to_renderpass2.h",
207207
]
208208

209209
object_lifetimes_sources = [
@@ -214,13 +214,13 @@ object_lifetimes_sources = [
214214
]
215215

216216
stateless_validation_sources = [
217+
"$_checkout_dir/layers/generated/enum_flag_bits.h",
217218
"$_checkout_dir/layers/generated/parameter_validation.cpp",
218219
"$_checkout_dir/layers/generated/parameter_validation.h",
219-
"$_checkout_dir/layers/generated/enum_flag_bits.h",
220220
"$_checkout_dir/layers/stateless/parameter_name.h",
221221
"$_checkout_dir/layers/stateless/sl_buffer.cpp",
222-
"$_checkout_dir/layers/stateless/sl_cmd_buffer_dynamic.cpp",
223222
"$_checkout_dir/layers/stateless/sl_cmd_buffer.cpp",
223+
"$_checkout_dir/layers/stateless/sl_cmd_buffer_dynamic.cpp",
224224
"$_checkout_dir/layers/stateless/sl_descriptor.cpp",
225225
"$_checkout_dir/layers/stateless/sl_device_memory.cpp",
226226
"$_checkout_dir/layers/stateless/sl_external_object.cpp",
@@ -245,6 +245,7 @@ unique_objects_sources = []
245245
best_practices_sources = [
246246
"$_checkout_dir/layers/best_practices/best_practices_error_enums.h",
247247
"$_checkout_dir/layers/best_practices/best_practices_utils.cpp",
248+
"$_checkout_dir/layers/best_practices/best_practices_validation.h",
248249
"$_checkout_dir/layers/best_practices/bp_buffer.cpp",
249250
"$_checkout_dir/layers/best_practices/bp_cmd_buffer.cpp",
250251
"$_checkout_dir/layers/best_practices/bp_copy_blit_resolve.cpp",
@@ -260,7 +261,6 @@ best_practices_sources = [
260261
"$_checkout_dir/layers/best_practices/bp_synchronization.cpp",
261262
"$_checkout_dir/layers/best_practices/bp_video.cpp",
262263
"$_checkout_dir/layers/best_practices/bp_wsi.cpp",
263-
"$_checkout_dir/layers/best_practices/best_practices_validation.h",
264264
"$_checkout_dir/layers/generated/best_practices.cpp",
265265
"$_checkout_dir/layers/generated/best_practices.h",
266266
]
@@ -271,21 +271,21 @@ debug_printf_sources = [
271271
]
272272

273273
chassis_sources = [
274-
"$vulkan_headers_dir/include/vulkan/vk_layer.h",
275-
"$vulkan_headers_dir/include/vulkan/vulkan.h",
276274
"$_checkout_dir/layers/generated/chassis.cpp",
277-
"$_checkout_dir/layers/generated/valid_param_values.cpp",
278-
"$_checkout_dir/layers/generated/valid_param_values.h",
279275
"$_checkout_dir/layers/generated/chassis.h",
280276
"$_checkout_dir/layers/generated/chassis_dispatch_helper.h",
281277
"$_checkout_dir/layers/generated/layer_chassis_dispatch.cpp",
282278
"$_checkout_dir/layers/generated/layer_chassis_dispatch.h",
279+
"$_checkout_dir/layers/generated/valid_param_values.cpp",
280+
"$_checkout_dir/layers/generated/valid_param_values.h",
283281
"$_checkout_dir/layers/generated/vk_dispatch_table_helper.h",
284282
"$_checkout_dir/layers/generated/vk_extension_helper.h",
285283
"$_checkout_dir/layers/generated/vk_safe_struct.cpp",
286284
"$_checkout_dir/layers/layer_options.cpp",
287285
"$_checkout_dir/layers/layer_options.h",
288286
"$_checkout_dir/layers/vk_layer_settings_ext.h",
287+
"$vulkan_headers_dir/include/vulkan/vk_layer.h",
288+
"$vulkan_headers_dir/include/vulkan/vulkan.h",
289289
]
290290

291291
layers = [ [
@@ -351,10 +351,12 @@ source_set("vulkan_layer_utils") {
351351
"$_checkout_dir/layers/generated",
352352
]
353353
sources = [
354-
"$vulkan_headers_dir/include/vulkan/vk_layer.h",
355-
"$vulkan_headers_dir/include/vulkan/vulkan.h",
356-
"$_checkout_dir/layers/utils/android_ndk_types.h",
357-
"$_checkout_dir/layers/utils/cast_utils.h",
354+
"$_checkout_dir/layers/containers/custom_containers.h",
355+
"$_checkout_dir/layers/containers/sparse_containers.h",
356+
"$_checkout_dir/layers/error_message/logging.cpp",
357+
"$_checkout_dir/layers/error_message/logging.h",
358+
"$_checkout_dir/layers/external/xxhash.cpp",
359+
"$_checkout_dir/layers/external/xxhash.h",
358360
"$_checkout_dir/layers/generated/vk_enum_string_helper.h",
359361
"$_checkout_dir/layers/generated/vk_extension_helper.h",
360362
"$_checkout_dir/layers/generated/vk_format_utils.cpp",
@@ -364,20 +366,18 @@ source_set("vulkan_layer_utils") {
364366
"$_checkout_dir/layers/generated/vk_safe_struct.h",
365367
"$_checkout_dir/layers/generated/vk_typemap_helper.h",
366368
"$_checkout_dir/layers/generated/vk_validation_error_messages.h",
369+
"$_checkout_dir/layers/utils/android_ndk_types.h",
370+
"$_checkout_dir/layers/utils/cast_utils.h",
367371
"$_checkout_dir/layers/utils/hash_util.h",
368372
"$_checkout_dir/layers/utils/hash_vk_types.h",
369-
"$_checkout_dir/layers/containers/sparse_containers.h",
370-
"$_checkout_dir/layers/containers/custom_containers.h",
371-
"$_checkout_dir/layers/vk_layer_config.cpp",
372-
"$_checkout_dir/layers/vk_layer_config.h",
373373
"$_checkout_dir/layers/utils/vk_layer_extension_utils.cpp",
374374
"$_checkout_dir/layers/utils/vk_layer_extension_utils.h",
375-
"$_checkout_dir/layers/error_message/logging.h",
376-
"$_checkout_dir/layers/error_message/logging.cpp",
377375
"$_checkout_dir/layers/utils/vk_layer_utils.cpp",
378376
"$_checkout_dir/layers/utils/vk_layer_utils.h",
379-
"$_checkout_dir/layers/external/xxhash.cpp",
380-
"$_checkout_dir/layers/external/xxhash.h",
377+
"$_checkout_dir/layers/vk_layer_config.cpp",
378+
"$_checkout_dir/layers/vk_layer_config.h",
379+
"$vulkan_headers_dir/include/vulkan/vk_layer.h",
380+
"$vulkan_headers_dir/include/vulkan/vulkan.h",
381381
]
382382
defines = [ "XXH_NO_LONG_LONG" ]
383383
public_configs = [
@@ -433,6 +433,7 @@ foreach(layer_info, layers) {
433433
} else {
434434
configs -= [ "//build/config/compiler:chromium_code" ]
435435
configs += [ "//build/config/compiler:no_chromium_code" ]
436+
436437
# The following line is what has to change to fix chromium compilation.
437438
configs -= [ "//build/config/compiler:no_rtti" ]
438439
configs += [ "//build/config/compiler:rtti" ]
@@ -463,7 +464,7 @@ foreach(layer_info, layers) {
463464
}
464465
if (is_android) {
465466
libs = [
466-
"c++", # Note: C++ added by Flutter.
467+
"c++", # Note: C++ added by Flutter.
467468
"log",
468469
"nativewindow",
469470
]

0 commit comments

Comments
 (0)