From 2c61d2336bb9cdba25d731c4f3d9cf2d0a7239bc Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Tue, 29 Oct 2019 09:49:16 -0700 Subject: [PATCH] Reformat BUILD.gn files to comply with the format checker presubmit script (flutter/engine#13401) --- engine/src/flutter/build/darwin/ios_app.gni | 12 +++++++----- engine/src/flutter/build/zip_bundle.gni | 9 +++++++-- engine/src/flutter/flutter_frontend_server/BUILD.gn | 1 - engine/src/flutter/shell/platform/android/BUILD.gn | 2 +- .../src/flutter/shell/platform/darwin/ios/BUILD.gn | 4 +--- engine/src/flutter/shell/platform/embedder/BUILD.gn | 2 +- .../platform/fuchsia/dart_runner/embedder/BUILD.gn | 3 ++- engine/src/flutter/sky/packages/sky_engine/BUILD.gn | 3 ++- engine/src/flutter/testing/testing.gni | 4 +++- engine/src/flutter/web_sdk/BUILD.gn | 4 ++-- 10 files changed, 26 insertions(+), 18 deletions(-) diff --git a/engine/src/flutter/build/darwin/ios_app.gni b/engine/src/flutter/build/darwin/ios_app.gni index 920019f0ec8..13b94e5b5c3 100644 --- a/engine/src/flutter/build/darwin/ios_app.gni +++ b/engine/src/flutter/build/darwin/ios_app.gni @@ -6,15 +6,17 @@ template("ios_app") { assert(is_ios) copy("${target_name}__info_plist") { - sources = [ invoker.info_plist ] - outputs = [ "$root_out_dir/${target_name}.app/Info.plist" ] + sources = [ + invoker.info_plist, + ] + outputs = [ + "$root_out_dir/${target_name}.app/Info.plist", + ] } executable("$target_name") { forward_variables_from(invoker, "*") output_name = "${target_name}.app/$target_name" - deps += [ - ":${target_name}__info_plist", - ] + deps += [ ":${target_name}__info_plist" ] } } diff --git a/engine/src/flutter/build/zip_bundle.gni b/engine/src/flutter/build/zip_bundle.gni index b1830de9978..4306f3e7d5d 100644 --- a/engine/src/flutter/build/zip_bundle.gni +++ b/engine/src/flutter/build/zip_bundle.gni @@ -37,11 +37,16 @@ template("zip_bundle") { assert(defined(invoker.files), "files must be defined as a list of scopes") action(target_name) { script = "//flutter/build/zip.py" - outputs = [ "$root_build_dir/zip_archives/${invoker.output}" ] + outputs = [ + "$root_build_dir/zip_archives/${invoker.output}", + ] inputs = [] deps = invoker.deps - args = [ "-o", rebase_path(outputs[0]) ] + args = [ + "-o", + rebase_path(outputs[0]), + ] foreach(input, invoker.files) { args += [ "-i", diff --git a/engine/src/flutter/flutter_frontend_server/BUILD.gn b/engine/src/flutter/flutter_frontend_server/BUILD.gn index fc51b725a15..75887f22cec 100644 --- a/engine/src/flutter/flutter_frontend_server/BUILD.gn +++ b/engine/src/flutter/flutter_frontend_server/BUILD.gn @@ -41,7 +41,6 @@ if (is_fuchsia_host || is_fuchsia) { deps = [ ":flutter_frontend_server", ] - } } else { import("//third_party/dart/utils/application_snapshot.gni") diff --git a/engine/src/flutter/shell/platform/android/BUILD.gn b/engine/src/flutter/shell/platform/android/BUILD.gn index b0c97c5b837..473995a76f6 100644 --- a/engine/src/flutter/shell/platform/android/BUILD.gn +++ b/engine/src/flutter/shell/platform/android/BUILD.gn @@ -419,10 +419,10 @@ action("robolectric_tests") { "test/io/flutter/embedding/android/FlutterAndroidComponentTest.java", "test/io/flutter/embedding/android/FlutterFragmentTest.java", "test/io/flutter/embedding/android/FlutterViewTest.java", - "test/io/flutter/embedding/engine/dart/DartExecutorTest.java", "test/io/flutter/embedding/engine/FlutterEngineCacheTest.java", "test/io/flutter/embedding/engine/FlutterJNITest.java", "test/io/flutter/embedding/engine/RenderingComponentTest.java", + "test/io/flutter/embedding/engine/dart/DartExecutorTest.java", "test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java", "test/io/flutter/embedding/engine/systemchannels/PlatformChannelTest.java", "test/io/flutter/plugin/common/StandardMessageCodecTest.java", diff --git a/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn b/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn index 36d5d1df557..f29737c3368 100644 --- a/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn +++ b/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn @@ -263,9 +263,7 @@ ios_app("FlutterTests") { "flutter_unittests.mm", ] - libs = [ - "Foundation.framework", - ] + libs = [ "Foundation.framework" ] deps = [ ":flutter_tests_fixtures", diff --git a/engine/src/flutter/shell/platform/embedder/BUILD.gn b/engine/src/flutter/shell/platform/embedder/BUILD.gn index 742dba3aae1..fad30600a4c 100644 --- a/engine/src/flutter/shell/platform/embedder/BUILD.gn +++ b/engine/src/flutter/shell/platform/embedder/BUILD.gn @@ -125,9 +125,9 @@ if (current_toolchain == host_toolchain) { "$flutter_root/testing:dart", "$flutter_root/testing:opengl", "$flutter_root/testing:skia", + "//third_party/dart/runtime/bin:elf_loader", "//third_party/skia", "//third_party/tonic", - "//third_party/dart/runtime/bin:elf_loader", ] } } diff --git a/engine/src/flutter/shell/platform/fuchsia/dart_runner/embedder/BUILD.gn b/engine/src/flutter/shell/platform/fuchsia/dart_runner/embedder/BUILD.gn index 1a3a220c6fc..6a0e0df3bb3 100644 --- a/engine/src/flutter/shell/platform/fuchsia/dart_runner/embedder/BUILD.gn +++ b/engine/src/flutter/shell/platform/fuchsia/dart_runner/embedder/BUILD.gn @@ -61,7 +61,8 @@ template("create_aot_snapshot") { # No asserts in debug or release product. # No asserts in release with flutter_profile=true (non-product) # Yes asserts in non-product debug. - if (!invoker.product && (!(flutter_runtime_mode == "profile") || is_debug)) { + if (!invoker.product && + (!(flutter_runtime_mode == "profile") || is_debug)) { args += [ "--enable_asserts" ] } args += [ rebase_path(shim_kernel) ] diff --git a/engine/src/flutter/sky/packages/sky_engine/BUILD.gn b/engine/src/flutter/sky/packages/sky_engine/BUILD.gn index 49109c36422..6d033c4c53b 100644 --- a/engine/src/flutter/sky/packages/sky_engine/BUILD.gn +++ b/engine/src/flutter/sky/packages/sky_engine/BUILD.gn @@ -4,7 +4,8 @@ import("//build/fuchsia/sdk.gni") import("//third_party/dart/sdk/lib/_http/http_sources.gni") -import("//third_party/dart/sdk/lib/_internal/js_runtime/interceptors_sources.gni") +import( + "//third_party/dart/sdk/lib/_internal/js_runtime/interceptors_sources.gni") import("//third_party/dart/sdk/lib/async/async_sources.gni") import("//third_party/dart/sdk/lib/collection/collection_sources.gni") import("//third_party/dart/sdk/lib/convert/convert_sources.gni") diff --git a/engine/src/flutter/testing/testing.gni b/engine/src/flutter/testing/testing.gni index 3bc3905160b..7372ad6db9b 100644 --- a/engine/src/flutter/testing/testing.gni +++ b/engine/src/flutter/testing/testing.gni @@ -128,7 +128,9 @@ template("dart_snapshot_aot") { # Custom ELF loader is used for Mac and Windows. elf_object = "$target_gen_dir/assets/app_elf_snapshot.so" - outputs = [elf_object] + outputs = [ + elf_object, + ] args = [ "--causal_async_stacks", diff --git a/engine/src/flutter/web_sdk/BUILD.gn b/engine/src/flutter/web_sdk/BUILD.gn index 175f6a823e6..895e7aa8151 100644 --- a/engine/src/flutter/web_sdk/BUILD.gn +++ b/engine/src/flutter/web_sdk/BUILD.gn @@ -98,7 +98,7 @@ copy("web_ui_library") { # Compile the DDC SDK's summary. prebuilt_dart_action("flutter_dartdevc_kernel_sdk_outline") { deps = [ - "//third_party/dart:create_sdk", + "//third_party/dart:create_sdk", "//third_party/dart/pkg:pkg_files_stamp", "//third_party/dart/utils/dartdevc:dartdevc_files_stamp", "//third_party/dart/utils/dartdevc:dartdevc_sdk_patch_stamp", @@ -140,7 +140,7 @@ prebuilt_dart_action("flutter_dartdevc_kernel_sdk_outline") { # Compiles the DDC SDK's JS code. prebuilt_dart_action("flutter_dartdevc_kernel_sdk") { deps = [ - "//third_party/dart:create_sdk", + "//third_party/dart:create_sdk", "//third_party/dart/pkg:pkg_files_stamp", "//third_party/dart/utils/dartdevc:dartdevc_files_stamp", "//third_party/dart/utils/dartdevc:dartdevc_sdk_patch_stamp",