diff --git a/BUILD.gn b/BUILD.gn index 5a5200f7e95229fcedada064896463b5c31975e6..90ca39d0278440c419859cdaffc848d5d1ce9c90 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -37,9 +37,7 @@ config("fuchsia_legacy") { config("export_dynamic_symbols") { if (is_linux || is_fuchsia) { - inputs = [ - "//flutter/common/exported_symbols.sym", - ] + inputs = [ "//flutter/common/exported_symbols.sym" ] ldflags = [ "-Wl,--dynamic-list=" + rebase_path(inputs[0], root_build_dir) ] } } @@ -165,17 +163,13 @@ group("flutter") { group("dist") { testonly = true - deps = [ - "//flutter/sky/dist", - ] + deps = [ "//flutter/sky/dist" ] } if (is_fuchsia) { group("fuchsia_tests") { testonly = true - deps = [ - "//flutter/shell/platform/fuchsia:tests", - ] + deps = [ "//flutter/shell/platform/fuchsia:tests" ] } } diff --git a/DEPS b/DEPS index 36b04b50577ea04d389e2cff881c56940f6c2e32..5f7e6477c1efe5054eed37d4e45b5565043e17f8 100644 --- a/DEPS +++ b/DEPS @@ -34,7 +34,7 @@ vars = { # Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS. # You can use //tools/dart/create_updated_flutter_deps.py to produce # updated revision list of existing dependencies. - 'dart_revision': '24c7666def53832a31559beac130eb3336008110', + 'dart_revision': '40fd1c456e0a872ab8f6d2a018b3436d2f7a5f84', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py @@ -107,7 +107,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '6728d80355083a20ceecb6db1d73c16dee255a43', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '4073a7a300d845597b8b2d553e584d3fd97f70df', # Fuchsia compatibility # @@ -485,7 +485,7 @@ deps = { 'packages': [ { 'package': 'gn/gn/${{platform}}', - 'version': 'git_revision:152c5144ceed9592c20f0c8fd55769646077569b' + 'version': 'git_revision:1e3fd10c5df6b704fc764ee388149e4f32862823' }, ], 'dep_type': 'cipd', diff --git a/build/dart/rules.gni b/build/dart/rules.gni index 1e4bb919ed2ddc1991117d7cdef0a8ba61f19412..dcafa6caf46170d1c8d6548f16ba3e16dd861ab8 100644 --- a/build/dart/rules.gni +++ b/build/dart/rules.gni @@ -163,12 +163,8 @@ template("dart_pkg") { dartx_application("${app_name}_dart_app") { output_name = dartx_output_name main_dart = rebase_path(app_entrypoint, "", pkg_helper_output_dir) - sources = [ - "$root_gen_dir/dart-pkg/${dart_package_name}.stamp", - ] - deps = [ - ":$dart_pkg_target_name", - ] + sources = [ "$root_gen_dir/dart-pkg/${dart_package_name}.stamp" ] + deps = [ ":$dart_pkg_target_name" ] deps += invoker.deps if (defined(invoker.strict)) { strict = invoker.strict @@ -178,9 +174,7 @@ template("dart_pkg") { } group(target_name) { - public_deps = [ - ":$dart_pkg_target_name", - ] + public_deps = [ ":$dart_pkg_target_name" ] if (defined(invoker.apps)) { foreach(app, invoker.apps) { app_name = app[0] diff --git a/build/zip_bundle.gni b/build/zip_bundle.gni index 4306f3e7d5d675be8762e7dd0044f5d4eb176de2..26fae8c96bf9ab6f2f584a0dcfa15cec022cf86a 100644 --- a/build/zip_bundle.gni +++ b/build/zip_bundle.gni @@ -37,9 +37,7 @@ 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 diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 1b3ca3fe025b07d96f78522c3883aea0a1b2d07f..c0d3c20fc98de33be525d2173e1e9d00d253caf5 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: ace4b50b35dcf1f0615ef82b87950698 +Signature: 97a28766592ed592458b78e7da5d05fd UNUSED LICENSES: diff --git a/common/BUILD.gn b/common/BUILD.gn index 552abed70f8f062e48bfd49ea305ad3574ad42c7..c276e4dbeacfdb3a9a2c30e50f1bdd4b7bb10842 100644 --- a/common/BUILD.gn +++ b/common/BUILD.gn @@ -16,9 +16,7 @@ source_set("common") { "task_runners.h", ] - deps = [ - "//flutter/fml", - ] + deps = [ "//flutter/fml" ] public_configs = [ ":flutter_config", diff --git a/flow/BUILD.gn b/flow/BUILD.gn index 643311cf98fd322a8eb7fd37a60190eff30d960c..89647c7189784a3a6d3ab09834948e2e3a1ef037 100644 --- a/flow/BUILD.gn +++ b/flow/BUILD.gn @@ -183,24 +183,18 @@ if (enable_unittests) { executable("flow_unittests") { testonly = true - deps = [ - ":flow_unittests_common_fuchsia_legacy", - ] + deps = [ ":flow_unittests_common_fuchsia_legacy" ] } executable("flow_unittests_next") { testonly = true - deps = [ - ":flow_unittests_common", - ] + deps = [ ":flow_unittests_common" ] } } else { executable("flow_unittests") { testonly = true - deps = [ - ":flow_unittests_common", - ] + deps = [ ":flow_unittests_common" ] } } } diff --git a/flutter_frontend_server/BUILD.gn b/flutter_frontend_server/BUILD.gn index 2f7b8417e2225e0556e3f25134ad9a4857209242..f477c194fe8bc230e9baa312018516c01c4e8420 100644 --- a/flutter_frontend_server/BUILD.gn +++ b/flutter_frontend_server/BUILD.gn @@ -22,9 +22,7 @@ frontend_server_files += application_snapshot("frontend_server") { main_dart = "bin/starter.dart" - deps = [ - "//flutter/lib/snapshot:kernel_platform_files", - ] + deps = [ "//flutter/lib/snapshot:kernel_platform_files" ] dot_packages = rebase_path(".dart_tool/package_config.json") flutter_patched_sdk = rebase_path("$root_out_dir/flutter_patched_sdk") training_args = [ diff --git a/fml/BUILD.gn b/fml/BUILD.gn index 8673841db57fc7010c957d4fc5da4dd760397d39..358fbee5483ff5d7d20043efe3ca8a9d223d0e62 100644 --- a/fml/BUILD.gn +++ b/fml/BUILD.gn @@ -230,9 +230,7 @@ if (enable_unittests) { executable("fml_benchmarks") { testonly = true - sources = [ - "message_loop_task_queues_benchmark.cc", - ] + sources = [ "message_loop_task_queues_benchmark.cc" ] deps = [ "//flutter/benchmarking", diff --git a/lib/snapshot/BUILD.gn b/lib/snapshot/BUILD.gn index b4773b65479a43788759a94c0908222d66cd8dde..eb71524900fac9561dc0dc7cc06517d9b0521c02 100644 --- a/lib/snapshot/BUILD.gn +++ b/lib/snapshot/BUILD.gn @@ -14,9 +14,7 @@ copy("generate_dart_ui") { visibility = [ ":*" ] sources = dart_ui_files - outputs = [ - "$bindings_output_dir/dart_ui/{{source_file_part}}", - ] + outputs = [ "$bindings_output_dir/dart_ui/{{source_file_part}}" ] } compiled_action("generate_snapshot_bin") { @@ -32,12 +30,8 @@ compiled_action("generate_snapshot_bin") { platform_kernel = "$root_out_dir/flutter_patched_sdk/platform_strong.dill" - inputs = [ - platform_kernel, - ] - deps = [ - ":kernel_platform_files", - ] + inputs = [ platform_kernel ] + deps = [ ":kernel_platform_files" ] vm_snapshot_data = "$target_gen_dir/vm_isolate_snapshot.bin" vm_snapshot_instructions = "$target_gen_dir/vm_snapshot_instructions.bin" @@ -109,9 +103,7 @@ template("bin_to_assembly") { script, invoker.input, ] - outputs = [ - output, - ] + outputs = [ output ] } } @@ -150,12 +142,8 @@ template("bin_to_coff") { if (current_cpu == "x64") { args += [ "--64-bit" ] } - inputs = [ - invoker.input, - ] - outputs = [ - output, - ] + inputs = [ invoker.input ] + outputs = [ output ] } } @@ -174,45 +162,35 @@ template("bin_to_linkable") { } bin_to_linkable("vm_snapshot_data_linkable") { - deps = [ - ":generate_snapshot_bin", - ] + deps = [ ":generate_snapshot_bin" ] input = "$target_gen_dir/vm_isolate_snapshot.bin" symbol = "kDartVmSnapshotData" executable = false } bin_to_linkable("vm_snapshot_instructions_linkable") { - deps = [ - ":generate_snapshot_bin", - ] + deps = [ ":generate_snapshot_bin" ] input = "$target_gen_dir/vm_snapshot_instructions.bin" symbol = "kDartVmSnapshotInstructions" executable = true } bin_to_linkable("isolate_snapshot_data_linkable") { - deps = [ - ":generate_snapshot_bin", - ] + deps = [ ":generate_snapshot_bin" ] input = "$target_gen_dir/isolate_snapshot.bin" symbol = "kDartIsolateSnapshotData" executable = false } bin_to_linkable("isolate_snapshot_instructions_linkable") { - deps = [ - ":generate_snapshot_bin", - ] + deps = [ ":generate_snapshot_bin" ] input = "$target_gen_dir/isolate_snapshot_instructions.bin" symbol = "kDartIsolateSnapshotInstructions" executable = true } bin_to_linkable("platform_strong_dill_linkable") { - deps = [ - ":kernel_platform_files", - ] + deps = [ ":kernel_platform_files" ] input = "$root_out_dir/flutter_patched_sdk/platform_strong.dill" symbol = "kPlatformStrongDill" size_symbol = "kPlatformStrongDillSize" @@ -261,7 +239,5 @@ compile_platform("strong_platform") { # Fuchsia's snapshot requires a different platform with extra dart: libraries. group("kernel_platform_files") { - public_deps = [ - ":strong_platform", - ] + public_deps = [ ":strong_platform" ] } diff --git a/lib/ui/BUILD.gn b/lib/ui/BUILD.gn index 1fd1d7cdf93a3f910f9aa060524ef33829d79727..260ebf7cd0622859dee60d1bfebd81e625fdb04b 100644 --- a/lib/ui/BUILD.gn +++ b/lib/ui/BUILD.gn @@ -113,9 +113,7 @@ source_set_maybe_fuchsia_legacy("ui") { public_configs = [ "//flutter:config" ] - public_deps = [ - "//flutter/third_party/txt", - ] + public_deps = [ "//flutter/third_party/txt" ] deps = [ "//flutter/assets", @@ -163,9 +161,7 @@ if (enable_unittests) { public_configs = [ "//flutter:export_dynamic_symbols" ] - sources = [ - "ui_benchmarks.cc", - ] + sources = [ "ui_benchmarks.cc" ] deps = [ ":ui", @@ -213,24 +209,18 @@ if (enable_unittests) { executable("ui_unittests") { testonly = true - deps = [ - ":ui_unittests_common_fuchsia_legacy", - ] + deps = [ ":ui_unittests_common_fuchsia_legacy" ] } executable("ui_unittests_next") { testonly = true - deps = [ - ":ui_unittests_common", - ] + deps = [ ":ui_unittests_common" ] } } else { executable("ui_unittests") { testonly = true - deps = [ - ":ui_unittests_common", - ] + deps = [ ":ui_unittests_common" ] } } } diff --git a/runtime/BUILD.gn b/runtime/BUILD.gn index 3cf9cb75739bd50b7bee68ab58d669e182126070..9bd85d53d581fb428f33e742d619b7beeb2aba1b 100644 --- a/runtime/BUILD.gn +++ b/runtime/BUILD.gn @@ -10,9 +10,7 @@ source_set("test_font") { "test_font_data.cc", "test_font_data.h", ] - deps = [ - "//third_party/skia", - ] + deps = [ "//third_party/skia" ] public_configs = [ "//flutter:config" ] defines = [] if (flutter_runtime_mode == "debug" || current_toolchain == host_toolchain) { @@ -69,9 +67,7 @@ source_set_maybe_fuchsia_legacy("runtime") { "window_data.h", ] - public_deps = [ - "//third_party/rapidjson", - ] + public_deps = [ "//third_party/rapidjson" ] public_configs = [ "//flutter:config" ] @@ -142,25 +138,19 @@ if (enable_unittests) { executable("runtime_unittests") { testonly = true - deps = [ - ":runtime_unittests_common_fuchsia_legacy", - ] + deps = [ ":runtime_unittests_common_fuchsia_legacy" ] } executable("runtime_unittests_next") { testonly = true - deps = [ - ":runtime_unittests_common", - ] + deps = [ ":runtime_unittests_common" ] } } else { executable("runtime_unittests") { testonly = true - deps = [ - ":runtime_unittests_common", - ] + deps = [ ":runtime_unittests_common" ] } } } diff --git a/shell/BUILD.gn b/shell/BUILD.gn index e4bfd9e8fda5da104db95b559dcfd6894c85075e..0536023fbd0c1b79bc034edb24fe59f111ee852c 100644 --- a/shell/BUILD.gn +++ b/shell/BUILD.gn @@ -3,7 +3,5 @@ # found in the LICENSE file. group("shell") { - deps = [ - "platform", - ] + deps = [ "platform" ] } diff --git a/shell/common/BUILD.gn b/shell/common/BUILD.gn index 9e5fa56148f07e25622b748f4d8aff495c24ccf6..28ca87584f6dbec0d803c0b98332eabfebbef20f 100644 --- a/shell/common/BUILD.gn +++ b/shell/common/BUILD.gn @@ -30,9 +30,7 @@ template("dart_embedder_resources") { } output = invoker.output - outputs = [ - output, - ] + outputs = [ output ] inputs = [ script ] + invoker.inputs @@ -174,9 +172,7 @@ if (enable_unittests) { } shell_host_executable("shell_benchmarks") { - sources = [ - "shell_benchmarks.cc", - ] + sources = [ "shell_benchmarks.cc" ] deps = [ ":shell_unittests_fixtures", diff --git a/shell/platform/BUILD.gn b/shell/platform/BUILD.gn index d84a2ebbc5d4c776908dca5806e957687c5ffa38..66baf0e887fe1d71a73ecd7d6c765062607ad9d4 100644 --- a/shell/platform/BUILD.gn +++ b/shell/platform/BUILD.gn @@ -7,13 +7,9 @@ import("//flutter/shell/platform/config.gni") group("platform") { if (is_mac || is_ios) { - deps = [ - "darwin", - ] + deps = [ "darwin" ] } else if (is_android) { - deps = [ - "android", - ] + deps = [ "android" ] } else if (is_linux) { deps = [] if (enable_desktop_embeddings) { @@ -25,9 +21,7 @@ group("platform") { deps += [ "windows" ] } } else if (is_fuchsia) { - deps = [ - "fuchsia", - ] + deps = [ "fuchsia" ] } else { assert(false, "Unknown/Unsupported platform.") } diff --git a/shell/platform/android/BUILD.gn b/shell/platform/android/BUILD.gn index 6d55b3cc74fd8cb06d16c297aec9c5cdaf19e793..308c70af691e483c0857fcb3c4812a92ae695a65 100644 --- a/shell/platform/android/BUILD.gn +++ b/shell/platform/android/BUILD.gn @@ -99,9 +99,7 @@ action("gen_android_build_config_java") { build_config_java = "$target_gen_dir/io/flutter/BuildConfig.java" - outputs = [ - build_config_java, - ] + outputs = [ build_config_java ] args = [ "--out", @@ -151,14 +149,14 @@ android_java_sources = [ "io/flutter/embedding/engine/FlutterEnginePluginRegistry.java", "io/flutter/embedding/engine/FlutterJNI.java", "io/flutter/embedding/engine/FlutterOverlaySurface.java", - "io/flutter/embedding/engine/mutatorsstack/FlutterMutatorsStack.java", - "io/flutter/embedding/engine/mutatorsstack/FlutterMutatorView.java", "io/flutter/embedding/engine/FlutterShellArgs.java", "io/flutter/embedding/engine/dart/DartExecutor.java", "io/flutter/embedding/engine/dart/DartMessenger.java", "io/flutter/embedding/engine/dart/PlatformMessageHandler.java", "io/flutter/embedding/engine/loader/FlutterLoader.java", "io/flutter/embedding/engine/loader/ResourceExtractor.java", + "io/flutter/embedding/engine/mutatorsstack/FlutterMutatorView.java", + "io/flutter/embedding/engine/mutatorsstack/FlutterMutatorsStack.java", "io/flutter/embedding/engine/plugins/FlutterPlugin.java", "io/flutter/embedding/engine/plugins/PluginRegistry.java", "io/flutter/embedding/engine/plugins/activity/ActivityAware.java", @@ -295,9 +293,7 @@ action("flutter_shell_java") { args += rebase_path(sources, root_build_dir) - deps = [ - ":gen_android_build_config_java", - ] + deps = [ ":gen_android_build_config_java" ] } action("icudtl_object") { @@ -306,13 +302,9 @@ action("icudtl_object") { icudtl_input = "//third_party/icu/flutter/icudtl.dat" icudtl_output = "$root_build_dir/flutter_icu/icudtl.o" - inputs = [ - "$icudtl_input", - ] + inputs = [ "$icudtl_input" ] - outputs = [ - "$icudtl_output", - ] + outputs = [ "$icudtl_output" ] args = [ "--objcopy", @@ -374,16 +366,12 @@ action("android_jar") { action("pom_libflutter") { script = "//flutter/tools/androidx/generate_pom_file.py" - inputs = [ - "//flutter/tools/androidx/files.json", - ] + inputs = [ "//flutter/tools/androidx/files.json" ] artifact_id = string_replace(android_app_abi, "-", "_") + "_" + flutter_runtime_mode - outputs = [ - "$root_build_dir/$artifact_id.pom", - ] + outputs = [ "$root_build_dir/$artifact_id.pom" ] args = [ "--destination", @@ -398,15 +386,11 @@ action("pom_libflutter") { action("pom_embedding") { script = "//flutter/tools/androidx/generate_pom_file.py" - inputs = [ - "//flutter/tools/androidx/files.json", - ] + inputs = [ "//flutter/tools/androidx/files.json" ] artifact_id = "flutter_embedding_$flutter_runtime_mode" - outputs = [ - "$root_build_dir/$artifact_id.pom", - ] + outputs = [ "$root_build_dir/$artifact_id.pom" ] args = [ "--destination", @@ -513,9 +497,7 @@ zip_bundle("android_symbols") { }, ] - deps = [ - ":flutter_shell_native", - ] + deps = [ ":flutter_shell_native" ] } zip_bundle("android") { @@ -549,9 +531,7 @@ action("gen_android_javadoc") { script = "//flutter/tools/gen_javadoc.py" sources = android_java_sources + embedding_dependencies_jars - outputs = [ - "$target_gen_dir/javadocs", - ] + outputs = [ "$target_gen_dir/javadocs" ] args = [ "--out-dir", rebase_path(outputs[0]), @@ -574,7 +554,5 @@ zip_bundle("android_javadoc") { destination = "/" }, ] - deps = [ - ":gen_android_javadoc", - ] + deps = [ ":gen_android_javadoc" ] } diff --git a/shell/platform/android/context/BUILD.gn b/shell/platform/android/context/BUILD.gn index f510fbdd649df24ef97bff37edbf067996b4f302..70035e58a3fa84f58945888eff25078c2a3b0065 100644 --- a/shell/platform/android/context/BUILD.gn +++ b/shell/platform/android/context/BUILD.gn @@ -12,7 +12,5 @@ source_set("context") { public_configs = [ "//flutter:config" ] - deps = [ - "//flutter/fml", - ] + deps = [ "//flutter/fml" ] } diff --git a/shell/platform/android/jni/BUILD.gn b/shell/platform/android/jni/BUILD.gn index ed3b822f98d6a53c14247eeaa5c43ecd06652de5..7d95b56ad43991b36df05cf1958555bfde0cc871 100644 --- a/shell/platform/android/jni/BUILD.gn +++ b/shell/platform/android/jni/BUILD.gn @@ -25,15 +25,11 @@ source_set("jni") { source_set("jni_mock") { testonly = true - sources = [ - "jni_mock.h", - ] + sources = [ "jni_mock.h" ] public_configs = [ "//flutter:config" ] - deps = [ - ":jni", - ] + deps = [ ":jni" ] } test_fixtures("jni_fixtures") { @@ -43,9 +39,7 @@ test_fixtures("jni_fixtures") { executable("jni_unittests") { testonly = true - sources = [ - "jni_mock_unittest.cc", - ] + sources = [ "jni_mock_unittest.cc" ] deps = [ ":jni_fixtures", diff --git a/shell/platform/android/platform_view_android_delegate/BUILD.gn b/shell/platform/android/platform_view_android_delegate/BUILD.gn index 61f2019f0902bb4a3a2098d645f07c352e90883d..89dc76f4f3ec9552e2fb1c1180e1353499798a6b 100644 --- a/shell/platform/android/platform_view_android_delegate/BUILD.gn +++ b/shell/platform/android/platform_view_android_delegate/BUILD.gn @@ -30,9 +30,7 @@ test_fixtures("platform_view_android_delegate_fixtures") { executable("platform_view_android_delegate_unittests") { testonly = true - sources = [ - "platform_view_android_delegate_unittests.cc", - ] + sources = [ "platform_view_android_delegate_unittests.cc" ] deps = [ ":platform_view_android_delegate", diff --git a/shell/platform/common/cpp/BUILD.gn b/shell/platform/common/cpp/BUILD.gn index d318a1a35c6c728cc8aaf2b89e9d5bff77649b1b..b6c5a86b4d416c652282d11f74f509e80cbdfcb5 100644 --- a/shell/platform/common/cpp/BUILD.gn +++ b/shell/platform/common/cpp/BUILD.gn @@ -32,19 +32,13 @@ source_set("common_cpp_library_headers") { copy("publish_headers") { sources = _public_headers - outputs = [ - "$root_out_dir/{{source_file_part}}", - ] + outputs = [ "$root_out_dir/{{source_file_part}}" ] } source_set("common_cpp_input") { - public = [ - "text_input_model.h", - ] + public = [ "text_input_model.h" ] - sources = [ - "text_input_model.cc", - ] + sources = [ "text_input_model.cc" ] configs += [ ":desktop_library_implementation" ] @@ -88,13 +82,9 @@ source_set("common_cpp") { # embedding is futher along and it's clearer how much, if any, shared # API surface there will be. source_set("common_cpp_core") { - public = [ - "path_utils.h", - ] + public = [ "path_utils.h" ] - sources = [ - "path_utils.cc", - ] + sources = [ "path_utils.cc" ] } if (enable_unittests) { @@ -105,9 +95,7 @@ if (enable_unittests) { executable("common_cpp_core_unittests") { testonly = true - sources = [ - "path_utils_unittests.cc", - ] + sources = [ "path_utils_unittests.cc" ] deps = [ ":common_cpp_core", diff --git a/shell/platform/common/cpp/client_wrapper/BUILD.gn b/shell/platform/common/cpp/client_wrapper/BUILD.gn index 844be28bc3e2b6b1ab3ec67896993281313646e5..0b4f243c215dffd739e30761fd804e352ca44da4 100644 --- a/shell/platform/common/cpp/client_wrapper/BUILD.gn +++ b/shell/platform/common/cpp/client_wrapper/BUILD.gn @@ -10,9 +10,7 @@ source_set("client_wrapper") { sources = core_cpp_client_wrapper_sources public = core_cpp_client_wrapper_includes - deps = [ - "//flutter/shell/platform/common/cpp:common_cpp_library_headers", - ] + deps = [ "//flutter/shell/platform/common/cpp:common_cpp_library_headers" ] configs += [ "//flutter/shell/platform/common/cpp:desktop_library_implementation" ] @@ -29,9 +27,8 @@ source_set("client_wrapper_library_stubs") { defines = [ "FLUTTER_DESKTOP_LIBRARY" ] - public_deps = [ - "//flutter/shell/platform/common/cpp:common_cpp_library_headers", - ] + public_deps = + [ "//flutter/shell/platform/common/cpp:common_cpp_library_headers" ] } test_fixtures("client_wrapper_fixtures") { diff --git a/shell/platform/common/cpp/client_wrapper/publish.gni b/shell/platform/common/cpp/client_wrapper/publish.gni index bc16551564f8a579e1cfe02e4fbd1daf581d9735..e52bf6a319369d07862ab418da6e9dd2b9e30a5c 100644 --- a/shell/platform/common/cpp/client_wrapper/publish.gni +++ b/shell/platform/common/cpp/client_wrapper/publish.gni @@ -44,25 +44,19 @@ template("publish_client_wrapper") { ] sources = invoker.public - outputs = [ - "$publish_dir_root/include/$namespace/{{source_file_part}}", - ] + outputs = [ "$publish_dir_root/include/$namespace/{{source_file_part}}" ] } copy("${template_target_name}_publish_sources") { visibility = [ ":$template_target_name" ] sources = invoker.sources - outputs = [ - "$publish_dir_root/{{source_file_part}}", - ] + outputs = [ "$publish_dir_root/{{source_file_part}}" ] # GN on Windows appears to do #include checks even for copy # targets, so add the dependency to the headers to satisfy # the check. - deps = [ - ":${template_target_name}_publish_includes", - ] + deps = [ ":${template_target_name}_publish_includes" ] } } @@ -103,8 +97,6 @@ template("publish_client_wrapper_extension") { "sources", "directory_suffix", ]) - public_deps = [ - ":$core_target_name", - ] + public_deps = [ ":$core_target_name" ] } } diff --git a/shell/platform/darwin/BUILD.gn b/shell/platform/darwin/BUILD.gn index cace8efb9a88785bd067a3bbb75301beb8ae14c5..23c8e4055acf7bb3b28187daa3e716fa0c290c09 100644 --- a/shell/platform/darwin/BUILD.gn +++ b/shell/platform/darwin/BUILD.gn @@ -9,9 +9,7 @@ import("//flutter/testing/testing.gni") group("darwin") { if (is_ios) { - deps = [ - "ios:flutter_framework", - ] + deps = [ "ios:flutter_framework" ] } if (is_mac) { deps = [] diff --git a/shell/platform/darwin/ios/BUILD.gn b/shell/platform/darwin/ios/BUILD.gn index d57b7f132fe3857aa33c31daade1ec0fd3037459..737e72731232f9b1b52bd373555c1709a08e67d1 100644 --- a/shell/platform/darwin/ios/BUILD.gn +++ b/shell/platform/darwin/ios/BUILD.gn @@ -236,9 +236,7 @@ shared_library("create_flutter_framework_dylib") { public = _flutter_framework_headers - deps = [ - ":flutter_framework_source", - ] + deps = [ ":flutter_framework_source" ] public_configs = [ "//flutter:config" ] } @@ -246,27 +244,17 @@ shared_library("create_flutter_framework_dylib") { copy("copy_dylib") { visibility = [ ":*" ] - sources = [ - "$root_out_dir/libFlutter.dylib", - ] - outputs = [ - "$_flutter_framework_dir/Flutter", - ] + sources = [ "$root_out_dir/libFlutter.dylib" ] + outputs = [ "$_flutter_framework_dir/Flutter" ] - deps = [ - ":create_flutter_framework_dylib", - ] + deps = [ ":create_flutter_framework_dylib" ] } action("copy_framework_info_plist") { script = "//flutter/build/copy_info_plist.py" visibility = [ ":*" ] - sources = [ - "framework/Info.plist", - ] - outputs = [ - "$_flutter_framework_dir/Info.plist", - ] + sources = [ "framework/Info.plist" ] + outputs = [ "$_flutter_framework_dir/Info.plist" ] args = [ rebase_path(sources[0]), rebase_path(outputs[0]), @@ -276,12 +264,8 @@ action("copy_framework_info_plist") { copy("copy_framework_module_map") { visibility = [ ":*" ] - sources = [ - "framework/module.modulemap", - ] - outputs = [ - "$_flutter_framework_dir/Modules/module.modulemap", - ] + sources = [ "framework/module.modulemap" ] + outputs = [ "$_flutter_framework_dir/Modules/module.modulemap" ] } action("copy_framework_headers") { @@ -303,44 +287,28 @@ action("copy_framework_headers") { copy("copy_framework_icu") { visibility = [ ":*" ] - sources = [ - "//third_party/icu/flutter/icudtl.dat", - ] - outputs = [ - "$_flutter_framework_dir/{{source_file_part}}", - ] + sources = [ "//third_party/icu/flutter/icudtl.dat" ] + outputs = [ "$_flutter_framework_dir/{{source_file_part}}" ] } copy("copy_framework_podspec") { visibility = [ ":*" ] - sources = [ - "framework/Flutter.podspec", - ] - outputs = [ - "$root_out_dir/Flutter.podspec", - ] + sources = [ "framework/Flutter.podspec" ] + outputs = [ "$root_out_dir/Flutter.podspec" ] } copy("copy_license") { visibility = [ ":*" ] - sources = [ - "//LICENSE", - ] - outputs = [ - "$root_out_dir/LICENSE", - ] + sources = [ "//LICENSE" ] + outputs = [ "$root_out_dir/LICENSE" ] } shared_library("copy_and_verify_framework_headers") { visibility = [ ":*" ] include_dirs = [ "$_flutter_framework_headers_copy_dir" ] - sources = [ - "framework/Source/FlutterUmbrellaImport.m", - ] - deps = [ - ":copy_framework_headers", - ] + sources = [ "framework/Source/FlutterUmbrellaImport.m" ] + deps = [ ":copy_framework_headers" ] } group("flutter_framework") { diff --git a/shell/platform/darwin/macos/BUILD.gn b/shell/platform/darwin/macos/BUILD.gn index b22fd110effc8f76b3c9e1c19d871bef6befe20e..bacb6af24a1b2042c1ebb8b615ac2c54185f6afe 100644 --- a/shell/platform/darwin/macos/BUILD.gn +++ b/shell/platform/darwin/macos/BUILD.gn @@ -11,9 +11,7 @@ import("//flutter/shell/platform/glfw/config.gni") import("//flutter/testing/testing.gni") group("macos") { - deps = [ - ":flutter_framework", - ] + deps = [ ":flutter_framework" ] if (build_glfw_shell) { deps += [ ":flutter_macos_glfw", @@ -91,9 +89,7 @@ shared_library("flutter_framework_dylib") { ldflags = [ "-Wl,-install_name,@rpath/$_flutter_framework_filename/$_framework_binary_subpath" ] - deps = [ - ":flutter_framework_source", - ] + deps = [ ":flutter_framework_source" ] } test_fixtures("flutter_desktop_darwin_fixtures") { @@ -105,9 +101,7 @@ test_fixtures("flutter_desktop_darwin_fixtures") { executable("flutter_desktop_darwin_unittests") { testonly = true - sources = [ - "framework/Source/FlutterEngineUnittests.mm", - ] + sources = [ "framework/Source/FlutterEngineUnittests.mm" ] cflags_objcc = [ "-fobjc-arc" ] @@ -126,36 +120,22 @@ executable("flutter_desktop_darwin_unittests") { copy("copy_dylib") { visibility = [ ":*" ] - sources = [ - "$root_out_dir/lib$_flutter_framework_name.dylib", - ] - outputs = [ - "$_flutter_framework_dir/$_framework_binary_subpath", - ] + sources = [ "$root_out_dir/lib$_flutter_framework_name.dylib" ] + outputs = [ "$_flutter_framework_dir/$_framework_binary_subpath" ] - deps = [ - ":flutter_framework_dylib", - ] + deps = [ ":flutter_framework_dylib" ] } copy("copy_framework_info_plist") { visibility = [ ":*" ] - sources = [ - "framework/Info.plist", - ] - outputs = [ - "$_flutter_framework_dir/Versions/A/Resources/Info.plist", - ] + sources = [ "framework/Info.plist" ] + outputs = [ "$_flutter_framework_dir/Versions/A/Resources/Info.plist" ] } copy("copy_framework_module_map") { visibility = [ ":*" ] - sources = [ - "framework/module.modulemap", - ] - outputs = [ - "$_flutter_framework_dir/Versions/A/Modules/module.modulemap", - ] + sources = [ "framework/module.modulemap" ] + outputs = [ "$_flutter_framework_dir/Versions/A/Modules/module.modulemap" ] } action("copy_framework_headers") { @@ -177,30 +157,21 @@ action("copy_framework_headers") { copy("copy_framework_icu") { visibility = [ ":*" ] - sources = [ - "//third_party/icu/flutter/icudtl.dat", - ] - outputs = [ - "$_flutter_framework_dir/Versions/A/Resources/{{source_file_part}}", - ] + sources = [ "//third_party/icu/flutter/icudtl.dat" ] + outputs = + [ "$_flutter_framework_dir/Versions/A/Resources/{{source_file_part}}" ] } copy("copy_license") { visibility = [ ":*" ] - sources = [ - "//LICENSE", - ] - outputs = [ - "$root_out_dir/LICENSE", - ] + sources = [ "//LICENSE" ] + outputs = [ "$root_out_dir/LICENSE" ] } action("_generate_symlinks") { visibility = [ ":*" ] script = "//build/config/mac/package_framework.py" - outputs = [ - "$root_build_dir/$_flutter_framework_name.stamp", - ] + outputs = [ "$root_build_dir/$_flutter_framework_name.stamp" ] args = [ "--framework", "$_flutter_framework_filename", @@ -226,12 +197,8 @@ action("_generate_symlinks") { copy("copy_framework_podspec") { visibility = [ ":*" ] - sources = [ - "framework/FlutterMacOS.podspec", - ] - outputs = [ - "$root_out_dir/FlutterMacOS.podspec", - ] + sources = [ "framework/FlutterMacOS.podspec" ] + outputs = [ "$root_out_dir/FlutterMacOS.podspec" ] } group("flutter_framework") { @@ -243,9 +210,7 @@ group("flutter_framework") { if (build_glfw_shell) { shared_library("flutter_macos_glfw") { - deps = [ - "//flutter/shell/platform/glfw:flutter_glfw", - ] + deps = [ "//flutter/shell/platform/glfw:flutter_glfw" ] public_configs = [ "//flutter:config" ] } diff --git a/shell/platform/embedder/BUILD.gn b/shell/platform/embedder/BUILD.gn index 42821991b775cc1ff83a97af638ecf66c3456772..a38c0af7001e312b6f714165cd91e41c00aee8a3 100644 --- a/shell/platform/embedder/BUILD.gn +++ b/shell/platform/embedder/BUILD.gn @@ -75,9 +75,7 @@ template("embedder_source_set") { "//third_party/skia", ] - public_deps = [ - ":embedder_headers", - ] + public_deps = [ ":embedder_headers" ] public_configs += [ "//flutter:config" ] } @@ -92,9 +90,7 @@ embedder_source_set("embedder_as_internal_library") { } source_set("embedder_headers") { - public = [ - "embedder.h", - ] + public = [ "embedder.h" ] public_configs = [ "//flutter:config" ] } @@ -178,21 +174,15 @@ shared_library("flutter_engine_library") { ldflags = [ "-Wl,-install_name,@rpath/FlutterEmbedder.framework/$_framework_binary_subpath" ] } - deps = [ - ":embedder", - ] + deps = [ ":embedder" ] public_configs = [ "//flutter:config" ] } copy("copy_headers") { visibility = [ ":*" ] - sources = [ - "embedder.h", - ] - outputs = [ - "$root_out_dir/flutter_embedder.h", - ] + sources = [ "embedder.h" ] + outputs = [ "$root_out_dir/flutter_embedder.h" ] } if (is_mac && !embedder_for_target) { @@ -200,9 +190,7 @@ if (is_mac && !embedder_for_target) { copy("copy_framework_headers") { visibility = [ ":*" ] - sources = [ - "embedder.h", - ] + sources = [ "embedder.h" ] outputs = [ "$_flutter_embedder_framework_dir/Versions/A/Headers/FlutterEmbedder.h", ] @@ -210,23 +198,17 @@ if (is_mac && !embedder_for_target) { copy("copy_icu") { visibility = [ ":*" ] - sources = [ - "//third_party/icu/flutter/icudtl.dat", - ] - outputs = [ - "$_flutter_embedder_framework_dir/Versions/A/Resources/icudtl.dat", - ] + sources = [ "//third_party/icu/flutter/icudtl.dat" ] + outputs = + [ "$_flutter_embedder_framework_dir/Versions/A/Resources/icudtl.dat" ] } action("copy_info_plist") { script = "//flutter/build/copy_info_plist.py" visibility = [ ":*" ] - sources = [ - "assets/EmbedderInfo.plist", - ] - outputs = [ - "$_flutter_embedder_framework_dir/Versions/A/Resources/Info.plist", - ] + sources = [ "assets/EmbedderInfo.plist" ] + outputs = + [ "$_flutter_embedder_framework_dir/Versions/A/Resources/Info.plist" ] args = [ rebase_path(sources[0]), rebase_path(outputs[0]), @@ -236,9 +218,7 @@ if (is_mac && !embedder_for_target) { copy("copy_module_map") { visibility = [ ":*" ] - sources = [ - "assets/embedder.modulemap", - ] + sources = [ "assets/embedder.modulemap" ] outputs = [ "$_flutter_embedder_framework_dir/Versions/A/Modules/module.modulemap", ] @@ -247,24 +227,16 @@ if (is_mac && !embedder_for_target) { copy("copy_dylib") { visibility = [ ":*" ] - sources = [ - "$root_out_dir/libflutter_engine.dylib", - ] - outputs = [ - "$_flutter_embedder_framework_dir/$_framework_binary_subpath", - ] + sources = [ "$root_out_dir/libflutter_engine.dylib" ] + outputs = [ "$_flutter_embedder_framework_dir/$_framework_binary_subpath" ] - deps = [ - ":flutter_engine_library", - ] + deps = [ ":flutter_engine_library" ] } action("generate_symlinks") { visibility = [ ":*" ] script = "//build/config/mac/package_framework.py" - outputs = [ - "$root_build_dir/FlutterEmbedder.stamp", - ] + outputs = [ "$root_build_dir/FlutterEmbedder.stamp" ] args = [ "--framework", "FlutterEmbedder.framework", @@ -289,9 +261,7 @@ if (is_mac && !embedder_for_target) { group("flutter_embedder_framework") { visibility = [ ":*" ] - deps = [ - ":generate_symlinks", - ] + deps = [ ":generate_symlinks" ] } } diff --git a/shell/platform/fuchsia/BUILD.gn b/shell/platform/fuchsia/BUILD.gn index e46ccff1f31bea147399e019522f57a8ad094574..45dc143af8aed2e9801b8871ca1e8300caf50e2e 100644 --- a/shell/platform/fuchsia/BUILD.gn +++ b/shell/platform/fuchsia/BUILD.gn @@ -22,17 +22,13 @@ fuchsia_host_bundle("flutter_binaries") { _flutter_tester_label = "//flutter/shell/testing:testing($host_toolchain)" - deps = [ - _flutter_tester_label, - ] + deps = [ _flutter_tester_label ] _flutter_tester_bin_path = rebase_path(get_label_info(_flutter_tester_label, "root_out_dir") + "/flutter_tester") - sources = [ - _flutter_tester_bin_path, - ] + sources = [ _flutter_tester_bin_path ] } fuchsia_host_bundle("dart_binaries") { @@ -93,7 +89,5 @@ group("fuchsia") { group("tests") { testonly = true - deps = [ - "flutter:tests", - ] + deps = [ "flutter:tests" ] } diff --git a/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn b/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn index d8b4765ac0d335d9c5377c09b9d8ee197d47998a..2ff857aaf082a8aa4b4d0e1a8eda04c9e9998b8e 100644 --- a/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn +++ b/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn @@ -9,9 +9,7 @@ config("sdk_ext_config") { } group("fuchsia") { - public_deps = [ - ":sdk_ext", - ] + public_deps = [ ":sdk_ext" ] } source_set("sdk_ext") { diff --git a/shell/platform/fuchsia/dart/BUILD.gn b/shell/platform/fuchsia/dart/BUILD.gn index bcdf913a9659b802212fc6b4da3f96caec58d1ad..1ddbf02c0e519750415137229269a8c59096b164 100644 --- a/shell/platform/fuchsia/dart/BUILD.gn +++ b/shell/platform/fuchsia/dart/BUILD.gn @@ -9,9 +9,7 @@ import("//third_party/dart/utils/compile_platform.gni") application_snapshot("kernel_compiler") { main_dart = "compiler.dart" - deps = [ - "../flutter/kernel:kernel_platform_files($host_toolchain)", - ] + deps = [ "../flutter/kernel:kernel_platform_files($host_toolchain)" ] dot_packages = rebase_path("//third_party/dart/.dart_tool/package_config.json") diff --git a/shell/platform/fuchsia/dart_runner/BUILD.gn b/shell/platform/fuchsia/dart_runner/BUILD.gn index 197eabe0c9f6a11cd0ee148159de8357fc1c512a..c69df5c1222b650fca8cb6f98fd01c7bee7327b0 100644 --- a/shell/platform/fuchsia/dart_runner/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/BUILD.gn @@ -40,13 +40,13 @@ template("runner") { dart_deps = [] if (!invoker.product) { dart_deps += [ - "//third_party/dart/runtime/bin:dart_io_api", "//flutter/shell/platform/fuchsia/runtime/dart/utils:utils", + "//third_party/dart/runtime/bin:dart_io_api", ] } else { dart_deps += [ - "//third_party/dart/runtime/bin:dart_io_api_product", "//flutter/shell/platform/fuchsia/runtime/dart/utils:utils_product", + "//third_party/dart/runtime/bin:dart_io_api_product", ] } @@ -130,9 +130,7 @@ template("aot_runner_package") { product_suffix = "_product" } fuchsia_archive(target_name) { - deps = [ - ":dart_aot${product_suffix}_runner_bin", - ] + deps = [ ":dart_aot${product_suffix}_runner_bin" ] if (!invoker.product) { deps += [ "vmservice:vmservice_snapshot", diff --git a/shell/platform/fuchsia/dart_runner/embedder/BUILD.gn b/shell/platform/fuchsia/dart_runner/embedder/BUILD.gn index 6c4173b863ad80a51152cbf0af69076ccd9d0867..edbf3e4506ecd40a4c7e5f08ba744ef2e7d149c8 100644 --- a/shell/platform/fuchsia/dart_runner/embedder/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/embedder/BUILD.gn @@ -35,16 +35,10 @@ template("create_aot_snapshot") { shim_kernel = get_label_info(shim_target, "target_gen_dir") + "/shim${product_suffix}_kernel.dill" - inputs = [ - shim_kernel, - ] - outputs = [ - snapshot_assembly, - ] + inputs = [ shim_kernel ] + outputs = [ snapshot_assembly ] - deps = [ - shim_target, - ] + deps = [ shim_target ] if (invoker.product) { tool = gen_snapshot_product } else { @@ -70,9 +64,7 @@ template("create_aot_snapshot") { } source_set(target_name) { - deps = [ - ":${target_name}_assembly", - ] + deps = [ ":${target_name}_assembly" ] sources = [ "$target_gen_dir/aot${product_suffix}_vm_snapshot.S", diff --git a/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/BUILD.gn b/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/BUILD.gn index f8a76c2436c20b14302056081e2cef410fad81e1..8e856ad91271f4452081d77ef549588332af0601 100644 --- a/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/BUILD.gn @@ -6,9 +6,7 @@ import("//build/testing/environments.gni") import("//topaz/runtime/dart_runner/dart_app.gni") dart_jit_app("goodbye_dart_jit") { - sources = [ - "goodbye_dart.dart", - ] + sources = [ "goodbye_dart.dart" ] main_dart = "goodbye_dart.dart" source_dir = "." @@ -26,9 +24,7 @@ dart_jit_app("goodbye_dart_jit") { } dart_aot_app("goodbye_dart_aot") { - sources = [ - "goodbye_dart.dart", - ] + sources = [ "goodbye_dart.dart" ] main_dart = "goodbye_dart.dart" source_dir = "." @@ -46,12 +42,8 @@ dart_aot_app("goodbye_dart_aot") { } copy("copy_goodbye_dart_test") { - sources = [ - "goodbye_dart_test", - ] - outputs = [ - "${root_build_dir}/goodbye_dart_test", - ] + sources = [ "goodbye_dart_test" ] + outputs = [ "${root_build_dir}/goodbye_dart_test" ] } package("goodbye_dart_test") { @@ -62,7 +54,5 @@ package("goodbye_dart_test") { environments = basic_envs }, ] - deps = [ - ":copy_goodbye_dart_test", - ] + deps = [ ":copy_goodbye_dart_test" ] } diff --git a/shell/platform/fuchsia/dart_runner/examples/greeting/BUILD.gn b/shell/platform/fuchsia/dart_runner/examples/greeting/BUILD.gn index 082624f0874455dac78c62cb63ef5bd885cd34dd..067f8d4a671126dcd947b05e24a4452d4f104c21 100644 --- a/shell/platform/fuchsia/dart_runner/examples/greeting/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/examples/greeting/BUILD.gn @@ -7,9 +7,7 @@ import("//build/dart/dart_library.gni") dart_library("greeting") { infer_package_name = true - sources = [ - "greeting.dart", - ] + sources = [ "greeting.dart" ] source_dir = "." } diff --git a/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/interfaces/BUILD.gn b/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/interfaces/BUILD.gn index 19ac79665f66419fdccae8420103fb986b9fc417..49e3a43fd4a742d1021d0e7966df99eeed2fec84 100644 --- a/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/interfaces/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/interfaces/BUILD.gn @@ -7,7 +7,5 @@ import("//build/fidl/fidl.gni") fidl("interfaces") { name = "fuchsia.examples.hello" - sources = [ - "hello.fidl", - ] + sources = [ "hello.fidl" ] } diff --git a/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn b/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn index 6acacfff800ab5035a91a8ae173a6140c0d412f4..8d0ca96cb8404003f4fcbf2eba1f0904f3b886ef 100644 --- a/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn @@ -39,9 +39,7 @@ template("create_kernel_core_snapshot") { } compiled_action(target_name) { - deps = [ - ":kernel_platform_files", - ] + deps = [ ":kernel_platform_files" ] platform_dill = "$root_out_dir/dart_runner_patched_sdk/platform_strong.dill" compilation_trace = diff --git a/shell/platform/fuchsia/dart_runner/vmservice/BUILD.gn b/shell/platform/fuchsia/dart_runner/vmservice/BUILD.gn index b0c2adc7b65e4bd4c9af002e33b2b9b8e365f494..ce44912e7dea8efbabbd36769c9b38166f3b4789 100644 --- a/shell/platform/fuchsia/dart_runner/vmservice/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/vmservice/BUILD.gn @@ -42,19 +42,13 @@ template("aot_snapshot") { shim_kernel = get_label_info(shim_target, "target_gen_dir") + "/vmservice${product_suffix}_aot_kernel.dill" - deps = [ - shim_target, - ] + deps = [ shim_target ] snapshot_path = "$target_gen_dir/${kernel_name}_snapshot.so" - inputs = [ - shim_kernel, - ] + inputs = [ shim_kernel ] - outputs = [ - snapshot_path, - ] + outputs = [ snapshot_path ] if (product) { tool = gen_snapshot_product diff --git a/shell/platform/fuchsia/flutter/BUILD.gn b/shell/platform/fuchsia/flutter/BUILD.gn index ab119951f09df9cae92d0ed49d0cee5e59337816..ba68d1bac69058da5069df168933f54ece128782 100644 --- a/shell/platform/fuchsia/flutter/BUILD.gn +++ b/shell/platform/fuchsia/flutter/BUILD.gn @@ -184,9 +184,7 @@ template("aot_runner") { } fuchsia_archive(target_name) { - deps = [ - ":aot${product_suffix}", - ] + deps = [ ":aot${product_suffix}" ] if (!product) { deps += [ @@ -444,9 +442,7 @@ executable("flutter_runner_scenic_unittests") { "//third_party/skia", ] - public_deps = [ - "//third_party/googletest:gtest", - ] + public_deps = [ "//third_party/googletest:gtest" ] } # When adding a new dep here, please also ensure the dep is added to @@ -454,9 +450,7 @@ executable("flutter_runner_scenic_unittests") { fuchsia_archive("flutter_runner_tests") { testonly = true - deps = [ - ":flutter_runner_unittests", - ] + deps = [ ":flutter_runner_unittests" ] binary = "$target_name" @@ -497,9 +491,7 @@ fuchsia_archive("flutter_runner_tests") { fuchsia_archive("flutter_runner_tzdata_tests") { testonly = true - deps = [ - ":flutter_runner_tzdata_unittests", - ] + deps = [ ":flutter_runner_tzdata_unittests" ] binary = "$target_name" @@ -525,9 +517,7 @@ fuchsia_archive("flutter_runner_tzdata_tests") { fuchsia_archive("flutter_runner_scenic_tests") { testonly = true - deps = [ - ":flutter_runner_scenic_unittests", - ] + deps = [ ":flutter_runner_scenic_unittests" ] binary = "$target_name" @@ -551,17 +541,13 @@ fuchsia_archive("flutter_runner_scenic_tests") { } fuchsia_test_archive("fml_tests") { - deps = [ - "//flutter/fml:fml_unittests", - ] + deps = [ "//flutter/fml:fml_unittests" ] binary = "fml_unittests" } fuchsia_test_archive("flow_tests") { - deps = [ - "//flutter/flow:flow_unittests", - ] + deps = [ "//flutter/flow:flow_unittests" ] binary = "flow_unittests" @@ -585,9 +571,7 @@ fuchsia_test_archive("flow_tests") { } fuchsia_test_archive("flow_tests_next") { - deps = [ - "//flutter/flow:flow_unittests_next", - ] + deps = [ "//flutter/flow:flow_unittests_next" ] binary = "flow_unittests_next" @@ -703,17 +687,13 @@ fuchsia_test_archive("shell_tests_next") { } fuchsia_test_archive("testing_tests") { - deps = [ - "//flutter/testing:testing_unittests", - ] + deps = [ "//flutter/testing:testing_unittests" ] binary = "testing_unittests" } fuchsia_test_archive("txt_tests") { - deps = [ - "//flutter/third_party/txt:txt_unittests", - ] + deps = [ "//flutter/third_party/txt:txt_unittests" ] binary = "txt_unittests" diff --git a/shell/platform/fuchsia/flutter/engine_flutter_runner.gni b/shell/platform/fuchsia/flutter/engine_flutter_runner.gni index 57fd2286dea8cdcc68f971b2fa1cd1cc2405ce50..630575b0980c45027989afdb92f00acb6694c155 100644 --- a/shell/platform/fuchsia/flutter/engine_flutter_runner.gni +++ b/shell/platform/fuchsia/flutter/engine_flutter_runner.gni @@ -93,8 +93,8 @@ template("flutter_runner") { "../flutter:fuchsia_legacy_gpu_configuration", "//flutter/assets", "//flutter/common", - "//flutter/fml", "//flutter/flow:flow_fuchsia_legacy", + "//flutter/fml", "//flutter/lib/ui:ui_fuchsia_legacy", "//flutter/runtime:runtime_fuchsia_legacy", "//flutter/shell/common:common_fuchsia_legacy", diff --git a/shell/platform/fuchsia/flutter/kernel/BUILD.gn b/shell/platform/fuchsia/flutter/kernel/BUILD.gn index 945a07bc47cd50cab7f274a0c271a0a2907b45bf..2f162486585ee120615a79b01e2dfb54454eec3e 100644 --- a/shell/platform/fuchsia/flutter/kernel/BUILD.gn +++ b/shell/platform/fuchsia/flutter/kernel/BUILD.gn @@ -42,9 +42,7 @@ template("core_snapshot") { } compiled_action(target_name) { - deps = [ - ":kernel_platform_files", - ] + deps = [ ":kernel_platform_files" ] platform_dill = "$root_out_dir/flutter_runner_patched_sdk/platform_strong.dill" diff --git a/shell/platform/fuchsia/runtime/dart/profiler_symbols/BUILD.gn b/shell/platform/fuchsia/runtime/dart/profiler_symbols/BUILD.gn index e4e9a3b17033e0bd46ac3c46f978495443f68e24..8b0185a452afe2f8b7dd1b2bb8bec3047c58a5d5 100644 --- a/shell/platform/fuchsia/runtime/dart/profiler_symbols/BUILD.gn +++ b/shell/platform/fuchsia/runtime/dart/profiler_symbols/BUILD.gn @@ -11,15 +11,9 @@ template("generate_dart_profiler_symbols") { assert(defined(invoker.output), "Must define 'output'") prebuilt_dart_action(target_name) { - deps = [ - invoker.library_label, - ] - inputs = [ - invoker.library_path, - ] - outputs = [ - invoker.output, - ] + deps = [ invoker.library_label ] + inputs = [ invoker.library_path ] + outputs = [ invoker.output ] script = "dart_profiler_symbols.dart" diff --git a/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn b/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn index b2db2b9143912000dafc266c3f62d301829aff89..ecbfb0ead44ef3a4f9b61821cef746a4e6911c07 100644 --- a/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn +++ b/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn @@ -51,13 +51,9 @@ template("make_utils") { } make_utils("utils") { - deps = [ - "//third_party/dart/runtime/bin:elf_loader", - ] + deps = [ "//third_party/dart/runtime/bin:elf_loader" ] } make_utils("utils_product") { - deps = [ - "//third_party/dart/runtime/bin:elf_loader_product", - ] + deps = [ "//third_party/dart/runtime/bin:elf_loader_product" ] } diff --git a/shell/platform/glfw/BUILD.gn b/shell/platform/glfw/BUILD.gn index 0911a4d053af71f1bb09e7f6279bbf2f061c4fd5..b0e65d6328cbfd45d63350acdd5e38bd95c7b821 100644 --- a/shell/platform/glfw/BUILD.gn +++ b/shell/platform/glfw/BUILD.gn @@ -17,9 +17,8 @@ config("relative_flutter_glfw_headers") { source_set("flutter_glfw_headers") { public = _public_headers - public_deps = [ - "//flutter/shell/platform/common/cpp:common_cpp_library_headers", - ] + public_deps = + [ "//flutter/shell/platform/common/cpp:common_cpp_library_headers" ] configs += [ "//flutter/shell/platform/common/cpp:desktop_library_implementation" ] @@ -74,12 +73,8 @@ source_set("flutter_glfw") { copy("publish_headers_glfw") { sources = _public_headers - outputs = [ - "$root_out_dir/{{source_file_part}}", - ] + outputs = [ "$root_out_dir/{{source_file_part}}" ] # The GLFW header assumes the presence of the common headers. - deps = [ - "//flutter/shell/platform/common/cpp:publish_headers", - ] + deps = [ "//flutter/shell/platform/common/cpp:publish_headers" ] } diff --git a/shell/platform/glfw/client_wrapper/BUILD.gn b/shell/platform/glfw/client_wrapper/BUILD.gn index 81111434ace275a2b6d5c026093b38c75af68327..d5115de50d84c560bd61aac0d4afea96f722a697 100644 --- a/shell/platform/glfw/client_wrapper/BUILD.gn +++ b/shell/platform/glfw/client_wrapper/BUILD.gn @@ -62,9 +62,7 @@ source_set("client_wrapper_library_stubs_glfw") { defines = [ "FLUTTER_DESKTOP_LIBRARY" ] - public_deps = [ - "//flutter/shell/platform/glfw:flutter_glfw_headers", - ] + public_deps = [ "//flutter/shell/platform/glfw:flutter_glfw_headers" ] } test_fixtures("client_wrapper_glfw_fixtures") { diff --git a/shell/platform/linux/BUILD.gn b/shell/platform/linux/BUILD.gn index 3029ba6e8eaba6def47ab9211d14cef3fd5240af..efad5e89d868e4d94c31b61efc1be772a14fcb9f 100644 --- a/shell/platform/linux/BUILD.gn +++ b/shell/platform/linux/BUILD.gn @@ -33,9 +33,7 @@ config("disable_fatal_link_warnings") { if (build_glfw_shell) { shared_library("flutter_linux_glfw") { - deps = [ - "//flutter/shell/platform/glfw:flutter_glfw", - ] + deps = [ "//flutter/shell/platform/glfw:flutter_glfw" ] configs += [ ":disable_fatal_link_warnings" ] @@ -122,13 +120,9 @@ source_set("flutter_linux") { "//third_party/khronos:khronos_headers", ] - public_deps = [ - ":flutter_linux_sources", - ] + public_deps = [ ":flutter_linux_sources" ] - deps = [ - "//flutter/shell/platform/embedder:embedder_as_internal_library", - ] + deps = [ "//flutter/shell/platform/embedder:embedder_as_internal_library" ] } test_fixtures("flutter_linux_fixtures") { @@ -177,16 +171,12 @@ executable("flutter_linux_unittests") { } shared_library("flutter_linux_gtk") { - deps = [ - ":flutter_linux", - ] + deps = [ ":flutter_linux" ] public_configs = [ "//flutter:config" ] } copy("publish_headers_linux") { sources = _public_headers - outputs = [ - "$root_out_dir/flutter_linux/{{source_file_part}}", - ] + outputs = [ "$root_out_dir/flutter_linux/{{source_file_part}}" ] } diff --git a/shell/platform/windows/BUILD.gn b/shell/platform/windows/BUILD.gn index 27a2cdb366c3fb7022d6cd1f0da5476ffcc7c342..14adddc19c51f2d64d29ac1d4cbab760c193ac98 100644 --- a/shell/platform/windows/BUILD.gn +++ b/shell/platform/windows/BUILD.gn @@ -26,9 +26,8 @@ config("relative_flutter_windows_headers") { source_set("flutter_windows_headers") { public = _public_headers - public_deps = [ - "//flutter/shell/platform/common/cpp:common_cpp_library_headers", - ] + public_deps = + [ "//flutter/shell/platform/common/cpp:common_cpp_library_headers" ] configs += [ "//flutter/shell/platform/common/cpp:desktop_library_implementation" ] @@ -82,7 +81,11 @@ source_set("flutter_windows_source") { "//flutter/shell/platform/common/cpp/client_wrapper:client_wrapper", "//flutter/shell/platform/embedder:embedder_as_internal_library", "//flutter/shell/platform/windows/client_wrapper:client_wrapper_windows", - "//third_party/angle:libEGL_static", # the order of libEGL_static and libGLESv2_static is important.. if reversed, will cause a linker error DllMain already defined in LIBCMTD.lib + "//third_party/angle:libEGL_static", # the order of libEGL_static and + # libGLESv2_static is important.. if + # reversed, will cause a linker error + # DllMain already defined in + # LIBCMTD.lib "//third_party/angle:libGLESv2_static", "//third_party/rapidjson", ] @@ -90,20 +93,14 @@ source_set("flutter_windows_source") { copy("publish_headers_windows") { sources = _public_headers - outputs = [ - "$root_out_dir/{{source_file_part}}", - ] + outputs = [ "$root_out_dir/{{source_file_part}}" ] # The Windows header assumes the presence of the common headers. - deps = [ - "//flutter/shell/platform/common/cpp:publish_headers", - ] + deps = [ "//flutter/shell/platform/common/cpp:publish_headers" ] } shared_library("flutter_windows") { - deps = [ - ":flutter_windows_source", - ] + deps = [ ":flutter_windows_source" ] public_configs = [ "//flutter:config" ] } @@ -138,9 +135,7 @@ executable("flutter_windows_unittests") { } shared_library("flutter_windows_glfw") { - deps = [ - "//flutter/shell/platform/glfw:flutter_glfw", - ] + deps = [ "//flutter/shell/platform/glfw:flutter_glfw" ] public_configs = [ "//flutter:config" ] } diff --git a/shell/platform/windows/client_wrapper/BUILD.gn b/shell/platform/windows/client_wrapper/BUILD.gn index f92640e80f7f74b07c392a6ccfa4e492522747b9..6f89a81a2dd8a2cad75ad681a5863e80e734b8dc 100644 --- a/shell/platform/windows/client_wrapper/BUILD.gn +++ b/shell/platform/windows/client_wrapper/BUILD.gn @@ -57,9 +57,7 @@ source_set("client_wrapper_library_stubs_windows") { defines = [ "FLUTTER_DESKTOP_LIBRARY" ] - public_deps = [ - "//flutter/shell/platform/windows:flutter_windows_headers", - ] + public_deps = [ "//flutter/shell/platform/windows:flutter_windows_headers" ] } test_fixtures("client_wrapper_windows_fixtures") { diff --git a/shell/testing/BUILD.gn b/shell/testing/BUILD.gn index 7efbb33fbf7b9cb1d67f314fa9b39e1fb7892ca0..459e7e9886db652357b15855bf06b12d92c9ee15 100644 --- a/shell/testing/BUILD.gn +++ b/shell/testing/BUILD.gn @@ -12,9 +12,7 @@ executable("testing") { "//flutter:export_dynamic_symbols", ] - sources = [ - "tester_main.cc", - ] + sources = [ "tester_main.cc" ] deps = [ "//flutter/assets", diff --git a/sky/dist/BUILD.gn b/sky/dist/BUILD.gn index 530b374220dafb696798975b7c753f9ee186e736..33601a752dab767b75f6fcb5112c278d06fac7d3 100644 --- a/sky/dist/BUILD.gn +++ b/sky/dist/BUILD.gn @@ -11,12 +11,8 @@ if (is_android) { source = "//flutter/sky/packages/flutter_services" dest = "$root_build_dir/dist/packages/flutter_services" - inputs = [ - source, - ] - outputs = [ - dest, - ] + inputs = [ source ] + outputs = [ dest ] args = [ "--source", @@ -25,9 +21,7 @@ if (is_android) { rebase_path(dest), ] - deps = [ - "//flutter/sky/packages/flutter_services", - ] + deps = [ "//flutter/sky/packages/flutter_services" ] } action("sky_engine") { script = "//flutter/sky/tools/dist_dart_pkg.py" @@ -35,12 +29,8 @@ if (is_android) { source = "$root_gen_dir/dart-pkg/sky_engine" dest = "$root_build_dir/dist/packages/sky_engine" - inputs = [ - source, - ] - outputs = [ - dest, - ] + inputs = [ source ] + outputs = [ dest ] args = [ "--source", @@ -61,12 +51,8 @@ if (is_android) { source = "$root_gen_dir/dart-pkg/sky_services" dest = "$root_build_dir/dist/packages/sky_services" - inputs = [ - source, - ] - outputs = [ - dest, - ] + inputs = [ source ] + outputs = [ dest ] args = [ "--source", @@ -107,8 +93,6 @@ if (is_android) { group("dist") { if (is_android) { - deps = [ - ":zip", - ] + deps = [ ":zip" ] } } diff --git a/sky/packages/flutter_services/BUILD.gn b/sky/packages/flutter_services/BUILD.gn index fd3ac3b42e36867f62ee4d31f79d4aa3c5de62d9..ad36ae94b10a160d54fd218976fc50575ad9cb82 100644 --- a/sky/packages/flutter_services/BUILD.gn +++ b/sky/packages/flutter_services/BUILD.gn @@ -3,7 +3,5 @@ # found in the LICENSE file. group("flutter_services") { - deps = [ - "//flutter/sky/packages/sky_services", - ] + deps = [ "//flutter/sky/packages/sky_services" ] } diff --git a/sky/packages/sky_engine/BUILD.gn b/sky/packages/sky_engine/BUILD.gn index 55a2b63aac15079ca34e48e34da0828274a2e85b..0aad7cd01c3d366be1823b12745522caabe2eb87 100644 --- a/sky/packages/sky_engine/BUILD.gn +++ b/sky/packages/sky_engine/BUILD.gn @@ -26,13 +26,9 @@ import("//third_party/dart/sdk/lib/wasm/wasm_sources.gni") if (!is_fuchsia) { copy("copy_sky_engine_authors") { - sources = [ - "//AUTHORS", - ] + sources = [ "//AUTHORS" ] - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/{{source_file_part}}", - ] + outputs = [ "$root_gen_dir/dart-pkg/sky_engine/{{source_file_part}}" ] } } @@ -41,9 +37,8 @@ dart_sdk_lib_path = rebase_path("//third_party/dart/sdk/lib") copy("async") { lib_path = rebase_path("async", "", dart_sdk_lib_path) sources = rebase_path(async_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/async/{{source_file_part}}", - ] + outputs = + [ "$root_gen_dir/dart-pkg/sky_engine/lib/async/{{source_file_part}}" ] } copy("collection") { @@ -57,33 +52,29 @@ copy("collection") { copy("convert") { lib_path = rebase_path("convert", "", dart_sdk_lib_path) sources = rebase_path(convert_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/convert/{{source_file_part}}", - ] + outputs = + [ "$root_gen_dir/dart-pkg/sky_engine/lib/convert/{{source_file_part}}" ] } copy("core") { lib_path = rebase_path("core", "", dart_sdk_lib_path) sources = rebase_path(core_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/core/{{source_file_part}}", - ] + outputs = + [ "$root_gen_dir/dart-pkg/sky_engine/lib/core/{{source_file_part}}" ] } copy("developer") { lib_path = rebase_path("developer", "", dart_sdk_lib_path) sources = rebase_path(developer_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/developer/{{source_file_part}}", - ] + outputs = + [ "$root_gen_dir/dart-pkg/sky_engine/lib/developer/{{source_file_part}}" ] } copy("_http") { lib_path = rebase_path("_http", "", dart_sdk_lib_path) sources = rebase_path(http_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/_http/{{source_file_part}}", - ] + outputs = + [ "$root_gen_dir/dart-pkg/sky_engine/lib/_http/{{source_file_part}}" ] } copy("_interceptors") { @@ -97,65 +88,54 @@ copy("_interceptors") { copy("internal") { lib_path = rebase_path("internal", "", dart_sdk_lib_path) sources = rebase_path(internal_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/internal/{{source_file_part}}", - ] + outputs = + [ "$root_gen_dir/dart-pkg/sky_engine/lib/internal/{{source_file_part}}" ] } copy("io") { lib_path = rebase_path("io", "", dart_sdk_lib_path) sources = rebase_path(io_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/io/{{source_file_part}}", - ] + outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/io/{{source_file_part}}" ] } copy("ffi") { lib_path = rebase_path("ffi", "", dart_sdk_lib_path) sources = rebase_path(ffi_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/ffi/{{source_file_part}}", - ] + outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/ffi/{{source_file_part}}" ] } copy("html") { lib_path = rebase_path("html", "", dart_sdk_lib_path) sources = rebase_path(html_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/html/{{source_file_part}}", - ] + outputs = + [ "$root_gen_dir/dart-pkg/sky_engine/lib/html/{{source_file_part}}" ] } copy("isolate") { lib_path = rebase_path("isolate", "", dart_sdk_lib_path) sources = rebase_path(isolate_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/isolate/{{source_file_part}}", - ] + outputs = + [ "$root_gen_dir/dart-pkg/sky_engine/lib/isolate/{{source_file_part}}" ] } copy("js") { lib_path = rebase_path("js", "", dart_sdk_lib_path) sources = rebase_path(js_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/js/{{source_file_part}}", - ] + outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/js/{{source_file_part}}" ] } copy("js_util") { lib_path = rebase_path("js_util", "", dart_sdk_lib_path) sources = rebase_path(js_util_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/js_util/{{source_file_part}}", - ] + outputs = + [ "$root_gen_dir/dart-pkg/sky_engine/lib/js_util/{{source_file_part}}" ] } copy("math") { lib_path = rebase_path("math", "", dart_sdk_lib_path) sources = rebase_path(math_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/math/{{source_file_part}}", - ] + outputs = + [ "$root_gen_dir/dart-pkg/sky_engine/lib/math/{{source_file_part}}" ] } copy("typed_data") { @@ -169,23 +149,18 @@ copy("typed_data") { copy("wasm") { lib_path = rebase_path("wasm", "", dart_sdk_lib_path) sources = rebase_path(wasm_sdk_sources, "", lib_path) - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/wasm/{{source_file_part}}", - ] + outputs = + [ "$root_gen_dir/dart-pkg/sky_engine/lib/wasm/{{source_file_part}}" ] } copy("copy_dart_ui") { sources = dart_ui_files - outputs = [ - "$root_gen_dir/dart-pkg/sky_engine/lib/ui/{{source_file_part}}", - ] + outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/ui/{{source_file_part}}" ] } copy("copy_allowed_experiments") { - sources = [ - "//third_party/dart/sdk/lib/_internal/allowed_experiments.json", - ] + sources = [ "//third_party/dart/sdk/lib/_internal/allowed_experiments.json" ] outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/_internal/allowed_experiments.json", diff --git a/sky/packages/sky_services/BUILD.gn b/sky/packages/sky_services/BUILD.gn index 936274e72e572a38266539e654450e6276b88f31..077b3c588e09e89fa3ebdea62191f5feef3e82de 100644 --- a/sky/packages/sky_services/BUILD.gn +++ b/sky/packages/sky_services/BUILD.gn @@ -11,9 +11,7 @@ if (!is_fuchsia) { "//LICENSE", ] - outputs = [ - "$root_gen_dir/dart-pkg/sky_services/{{source_file_part}}", - ] + outputs = [ "$root_gen_dir/dart-pkg/sky_services/{{source_file_part}}" ] } } @@ -24,8 +22,6 @@ dart_pkg("sky_services") { ] if (!is_fuchsia) { - deps = [ - ":copy_sky_services_license", - ] + deps = [ ":copy_sky_services_license" ] } } diff --git a/testing/BUILD.gn b/testing/BUILD.gn index 788728d86f24e0ac1e384904d419e709fb389318..db338fb42d646563ff018f6e69a1b889e538e3c0 100644 --- a/testing/BUILD.gn +++ b/testing/BUILD.gn @@ -36,9 +36,7 @@ source_set("testing") { "test_timeout_listener.h", ] - public_deps = [ - ":testing_lib", - ] + public_deps = [ ":testing_lib" ] } source_set_maybe_fuchsia_legacy("dart") { @@ -90,9 +88,7 @@ source_set_maybe_fuchsia_legacy("fixture_test") { "fixture_test.h", ] - public_deps = [ - "//flutter/common", - ] + public_deps = [ "//flutter/common" ] public_deps_legacy_and_next = [ ":dart", diff --git a/testing/testing.gni b/testing/testing.gni index 917b0414979de015ac95e6bcb147350ca00621e3..ddab4905663cf5bc868647097c6e0f4345bb2120 100644 --- a/testing/testing.gni +++ b/testing/testing.gni @@ -35,9 +35,7 @@ template("fixtures_location") { source_set(target_name) { public = [] - sources = [ - location_source_path, - ] + sources = [ location_source_path ] } } @@ -70,13 +68,9 @@ template("dart_snapshot_kernel") { script = "$root_out_dir/frontend_server.dart.snapshot" - inputs = [ - invoker.dart_main, - ] + inputs = [ invoker.dart_main ] - outputs = [ - invoker.dart_kernel, - ] + outputs = [ invoker.dart_kernel ] snapshot_depfile = "$target_gen_dir/snapshot_$target_name.depfile.d" depfile = snapshot_depfile @@ -126,16 +120,12 @@ template("dart_snapshot_aot") { tool = "//third_party/dart/runtime/bin:gen_snapshot" - inputs = [ - invoker.dart_kernel, - ] + inputs = [ invoker.dart_kernel ] # 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 = [ "--no-causal_async_stacks", @@ -175,9 +165,7 @@ template("dart_snapshot") { dart_snapshot_aot_target_name = "_dsa_$target_name" dart_snapshot_aot(dart_snapshot_aot_target_name) { dart_kernel = dart_snapshot_kernel_path - deps = [ - ":$dart_snapshot_kernel_target_name", - ] + deps = [ ":$dart_snapshot_kernel_target_name" ] } snapshot_deps += [ ":$dart_snapshot_aot_target_name" ] } @@ -208,9 +196,7 @@ template("copy_fixtures") { if (has_fixtures) { copy(target_name) { sources = invoker.fixtures - outputs = [ - "$target_gen_dir/assets/{{source_file_part}}", - ] + outputs = [ "$target_gen_dir/assets/{{source_file_part}}" ] } } else { group(target_name) { diff --git a/third_party/tonic/converter/BUILD.gn b/third_party/tonic/converter/BUILD.gn index cb4c64b88d807df6cd5821065054f2ba575fbc6e..1cde8c17e5ff4a199dbb7b11af2eee994cc31301 100644 --- a/third_party/tonic/converter/BUILD.gn +++ b/third_party/tonic/converter/BUILD.gn @@ -12,11 +12,7 @@ source_set("converter") { "dart_converter.h", ] - deps = [ - "../common", - ] + deps = [ "../common" ] - public_deps = [ - "//third_party/dart/runtime:dart_api", - ] + public_deps = [ "//third_party/dart/runtime:dart_api" ] } diff --git a/third_party/tonic/filesystem/BUILD.gn b/third_party/tonic/filesystem/BUILD.gn index a8bbfd364c40c602bfeb222ea57b00a45ae9c496..d36cfe7183ee9d9bd7a0a8a6833d5b297b33d51c 100644 --- a/third_party/tonic/filesystem/BUILD.gn +++ b/third_party/tonic/filesystem/BUILD.gn @@ -3,7 +3,5 @@ # found in the LICENSE file. group("filesystem") { - public_deps = [ - "filesystem", - ] + public_deps = [ "filesystem" ] } diff --git a/third_party/tonic/filesystem/filesystem/BUILD.gn b/third_party/tonic/filesystem/filesystem/BUILD.gn index 7b8cbd688fa1246657764d41ccc2eb7da8a327ce..197a35e907ab4fa44baf9aa277eb1f59fad659e2 100644 --- a/third_party/tonic/filesystem/filesystem/BUILD.gn +++ b/third_party/tonic/filesystem/filesystem/BUILD.gn @@ -29,9 +29,7 @@ source_set("filesystem") { sources += [ "path_posix.cc" ] } - deps = [ - "../../common", - ] + deps = [ "../../common" ] public_configs = [ ":filesystem_config" ] } diff --git a/third_party/tonic/filesystem/tests/BUILD.gn b/third_party/tonic/filesystem/tests/BUILD.gn index 04d933b576751f915badb97ba668239c399ea43c..f61cdfc6137d3939a137ed4f160febcfb748d748 100644 --- a/third_party/tonic/filesystem/tests/BUILD.gn +++ b/third_party/tonic/filesystem/tests/BUILD.gn @@ -14,7 +14,5 @@ executable("files_unittests") { "scoped_temp_dir_unittest.cc", ] - deps = [ - ":../:filesystem", - ] + deps = [ ":../:filesystem" ] } diff --git a/third_party/tonic/logging/BUILD.gn b/third_party/tonic/logging/BUILD.gn index 2c458e0136ecc12892e72aff845d4f1c246c1142..cee90880f6070ba1ea76af60b820301561b0d3ba 100644 --- a/third_party/tonic/logging/BUILD.gn +++ b/third_party/tonic/logging/BUILD.gn @@ -19,7 +19,5 @@ source_set("logging") { "../converter", ] - public_deps = [ - "//third_party/dart/runtime:dart_api", - ] + public_deps = [ "//third_party/dart/runtime:dart_api" ] } diff --git a/third_party/tonic/parsers/BUILD.gn b/third_party/tonic/parsers/BUILD.gn index a73ba2d0dce4419f23abd945223e5c5ca3a0aa4a..b03ae32a1363b98791a4c99fdde43319e7fbaa3f 100644 --- a/third_party/tonic/parsers/BUILD.gn +++ b/third_party/tonic/parsers/BUILD.gn @@ -7,9 +7,7 @@ source_set("parsers") { configs += [ "../:config" ] - deps = [ - "../common", - ] + deps = [ "../common" ] sources = [ "packages_map.cc", diff --git a/third_party/tonic/scopes/BUILD.gn b/third_party/tonic/scopes/BUILD.gn index 5b7a1193f2abd83e0b6cd7920c4055871639f706..af2a3a9fc6f5c5e4203e0681c81c14ab5d1bcb4c 100644 --- a/third_party/tonic/scopes/BUILD.gn +++ b/third_party/tonic/scopes/BUILD.gn @@ -13,11 +13,7 @@ source_set("scopes") { "dart_isolate_scope.h", ] - deps = [ - "../common", - ] + deps = [ "../common" ] - public_deps = [ - "//third_party/dart/runtime:dart_api", - ] + public_deps = [ "//third_party/dart/runtime:dart_api" ] } diff --git a/third_party/tonic/typed_data/BUILD.gn b/third_party/tonic/typed_data/BUILD.gn index 13765646c00d6f0c1bdc0feda0389518044d9665..cdc58d43afa626d069c1f56536ca0b22b7ab7058 100644 --- a/third_party/tonic/typed_data/BUILD.gn +++ b/third_party/tonic/typed_data/BUILD.gn @@ -21,9 +21,7 @@ source_set("typed_data") { "uint8_list.h", ] - deps = [ - "../common", - ] + deps = [ "../common" ] public_deps = [ "../converter", diff --git a/third_party/txt/BUILD.gn b/third_party/txt/BUILD.gn index a0fc4eb69ac4fde6d6bb6864fd788405216ab76a..2937804db5711e49fa3e790a22bc71f2d5a024fb 100644 --- a/third_party/txt/BUILD.gn +++ b/third_party/txt/BUILD.gn @@ -143,9 +143,7 @@ source_set("txt") { "//third_party/skia", ] - deps = [ - "//third_party/skia", - ] + deps = [ "//third_party/skia" ] if (flutter_use_fontconfig) { deps += [ "//third_party/fontconfig" ] @@ -180,8 +178,8 @@ source_set("txt") { if (enable_unittests) { txt_common_executable_deps = [ - "//third_party/dart/runtime:libdart_jit", # For logging. "//flutter/fml", # For ICU initialization. + "//third_party/dart/runtime:libdart_jit", # For logging. ] test_fixtures("txt_fixtures") { diff --git a/tools/const_finder/BUILD.gn b/tools/const_finder/BUILD.gn index 598f3f04b2eb30037b6b128fa878553546000072..0399e1011f80b8317206b81b26dfbaee4f625a47 100644 --- a/tools/const_finder/BUILD.gn +++ b/tools/const_finder/BUILD.gn @@ -16,7 +16,5 @@ application_snapshot("const_finder") { ".dart_tool/package_config.json", ] - deps = [ - "//flutter/flutter_frontend_server:frontend_server", - ] + deps = [ "//flutter/flutter_frontend_server:frontend_server" ] } diff --git a/tools/font-subset/BUILD.gn b/tools/font-subset/BUILD.gn index 9c2625833af3d8803979db15dc51c32bce26713e..54c5f75e3a10196e499ef9f0cc20fa5dbc904633 100644 --- a/tools/font-subset/BUILD.gn +++ b/tools/font-subset/BUILD.gn @@ -8,9 +8,7 @@ executable("font-subset") { "main.cc", ] - deps = [ - "//third_party/harfbuzz", - ] + deps = [ "//third_party/harfbuzz" ] libs = [] if (is_mac) { diff --git a/tools/fuchsia/dart_kernel.gni b/tools/fuchsia/dart_kernel.gni index f3ebc64d8b61d655d35e0aa4437b134382e3b758..97f098fbf67dd0ffa56e04a4cebfbff3b1003f2a 100644 --- a/tools/fuchsia/dart_kernel.gni +++ b/tools/fuchsia/dart_kernel.gni @@ -14,9 +14,7 @@ template("dart_kernel") { main_dart = rebase_path(invoker.main_dart) - deps = [ - invoker.kernel_platform_files, - ] + deps = [ invoker.kernel_platform_files ] gen_kernel_script = "//third_party/dart/pkg/vm/bin/gen_kernel.dart" platform_dill = "$root_out_dir/dart_runner_patched_sdk/platform_strong.dill" @@ -32,9 +30,7 @@ template("dart_kernel") { ] output = "$target_gen_dir/$target_name.dill" - outputs = [ - output, - ] + outputs = [ output ] depfile = "$output.d" abs_depfile = rebase_path(depfile) diff --git a/tools/fuchsia/fuchsia_archive.gni b/tools/fuchsia/fuchsia_archive.gni index 32d8f1215f21595871d1e49ff9d65b69325df261..d5986030ef8f4b1037c312e7c6bc6576a3aa6eb3 100644 --- a/tools/fuchsia/fuchsia_archive.gni +++ b/tools/fuchsia/fuchsia_archive.gni @@ -64,12 +64,8 @@ template("fuchsia_archive") { } copy("$cmx_target") { - sources = [ - "$cmx_file", - ] - outputs = [ - "$far_base_dir/meta/${pkg_target_name}.cmx", - ] + sources = [ "$cmx_file" ] + outputs = [ "$far_base_dir/meta/${pkg_target_name}.cmx" ] } write_file("${far_base_dir}/meta/package", diff --git a/tools/fuchsia/fuchsia_debug_symbols.gni b/tools/fuchsia/fuchsia_debug_symbols.gni index b610deb13d703ffd9c23174f6368db6e0b154ba5..5c6b04edca8f02debdafaeb72b70944e8fad4a7c 100644 --- a/tools/fuchsia/fuchsia_debug_symbols.gni +++ b/tools/fuchsia/fuchsia_debug_symbols.gni @@ -21,9 +21,7 @@ template("_copy_debug_symbols") { script = "//flutter/tools/fuchsia/copy_debug_symbols.py" - sources = [ - binary_path, - ] + sources = [ binary_path ] _dest_base = "${root_out_dir}/flutter-debug-symbols-${flutter_runtime_mode}-${target_os}-${target_cpu}" @@ -42,9 +40,7 @@ template("_copy_debug_symbols") { args += [ "--unstripped" ] } - outputs = [ - "${_dest_base}/.${target_name}_success", - ] + outputs = [ "${_dest_base}/.${target_name}_success" ] } } diff --git a/tools/fuchsia/fuchsia_host_bundle.gni b/tools/fuchsia/fuchsia_host_bundle.gni index 396fcffb4537d98b70cc6d869682a1cc644c3e7b..06a275f60408e316edbf4dd2942eaa8138c2a38b 100644 --- a/tools/fuchsia/fuchsia_host_bundle.gni +++ b/tools/fuchsia/fuchsia_host_bundle.gni @@ -17,8 +17,6 @@ template("fuchsia_host_bundle") { sources = invoker.sources - outputs = [ - "${_dest_dir}/{{source_file_part}}", - ] + outputs = [ "${_dest_dir}/{{source_file_part}}" ] } } diff --git a/web_sdk/BUILD.gn b/web_sdk/BUILD.gn index 205c25fda4bc13a6375d12377995173f6d811546..4ce681c00d04a7d3c2112e8756d59bc23fc7eeae 100644 --- a/web_sdk/BUILD.gn +++ b/web_sdk/BUILD.gn @@ -52,9 +52,7 @@ prebuilt_dart_action("web_ui_sources") { output_dir = rebase_path("$root_out_dir/flutter_web_sdk/lib/ui/") input_dir = rebase_path("//flutter/lib/web_ui/lib/") - outputs = [ - "$target_gen_dir/$target_name.stamp", - ] + outputs = [ "$target_gen_dir/$target_name.stamp" ] args = [ "--output-dir=$output_dir", @@ -78,9 +76,7 @@ prebuilt_dart_action("web_engine_sources") { output_dir = rebase_path("$root_out_dir/flutter_web_sdk/lib/_engine/") input_dir = rebase_path("//flutter/lib/web_ui/lib/src/") - outputs = [ - "$target_gen_dir/$target_name.stamp", - ] + outputs = [ "$target_gen_dir/$target_name.stamp" ] args = [ "--output-dir=$output_dir", @@ -97,13 +93,9 @@ prebuilt_dart_action("web_engine_sources") { } copy("web_ui_library") { - sources = [ - "//flutter/web_sdk/libraries.json", - ] + sources = [ "//flutter/web_sdk/libraries.json" ] - outputs = [ - "$root_out_dir/flutter_web_sdk/{{source_file_part}}", - ] + outputs = [ "$root_out_dir/flutter_web_sdk/{{source_file_part}}" ] } # Compile the DDC SDK's summary. @@ -117,9 +109,7 @@ prebuilt_dart_action("flutter_dartdevc_kernel_sdk_outline") { inputs = [ "sdk_rewriter.dart" ] + web_ui_sources + web_engine_sources - outputs = [ - sdk_dill, - ] + outputs = [ sdk_dill ] script = "//third_party/dart/utils/bazel/kernel_worker.dart" @@ -373,9 +363,7 @@ prebuilt_dart_action("flutter_dartdevc_kernel_sdk_outline_sound") { inputs = [ "sdk_rewriter.dart" ] + web_ui_sources + web_engine_sources - outputs = [ - sdk_dill_sound, - ] + outputs = [ sdk_dill_sound ] script = "//third_party/dart/utils/bazel/kernel_worker.dart"