diff --git a/BUILD.gn b/BUILD.gn index 58204204ef9c78fc6024dfa7e7972d973ca62d41..097d05001f8590380726ff1b0a980d2b2f9438b9 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -80,9 +80,7 @@ template("make_skia_deps") { ":ace_xml_$platform", ] - public_configs += [ - ":ace_svg_model_config", - ] + public_configs += [ ":ace_svg_model_config" ] if (is_standard_system) { deps += [ ":make_third_party_skia_include_dir" ] @@ -90,11 +88,14 @@ template("make_skia_deps") { } } -make_skia_deps("ohos") {} +make_skia_deps("ohos") { +} -make_skia_deps("windows") {} +make_skia_deps("windows") { +} -make_skia_deps("mac") {} +make_skia_deps("mac") { +} # ------------------------------------------------ # Main block end of skia @@ -445,7 +446,7 @@ template("flutter_engine_shell") { defines += [ "UNICODE" ] } else if (is_standard_system) { include_dirs = [ "//utils/native/base/include" ] - deps += [ "//foundation/graphic/standard:libwms_client" ] + deps += [ "//foundation/graphic/standard:libwmclient" ] sources += [ "engine/flutter/shell/platform/ohos/ohos_shell_holder.cc", "engine/flutter/shell/platform/ohos/ohos_surface_software.cc", @@ -2633,9 +2634,7 @@ config("ace_gpu_config") { } ohos_source_set("ace_gpu") { - configs = [ - ":ace_gpu_config", - ] + configs = [ ":ace_gpu_config" ] configs += [ ":reduce_eh_frame_config" ] sources = [ @@ -3238,9 +3237,7 @@ template("ace_xml") { forward_variables_from(invoker, "*") ohos_source_set(target_name) { - configs = [ - ":ace_xml_config", - ] + configs = [ ":ace_xml_config" ] configs += [ ":reduce_eh_frame_config" ] defines += invoker.defines diff --git a/engine/flutter/BUILD.gn b/engine/flutter/BUILD.gn index 3e6eef501f7e6d8d48ef4fb01ffe375b1b1e2183..61c5582ac4a06e303241f641dbe8a3f9ec12dcb1 100644 --- a/engine/flutter/BUILD.gn +++ b/engine/flutter/BUILD.gn @@ -91,9 +91,7 @@ config("config") { config("export_dynamic_symbols") { if (is_linux) { - inputs = [ - "$flutter_root/common/exported_symbols.sym", - ] + inputs = [ "$flutter_root/common/exported_symbols.sym" ] ldflags = [ "-Wl,--dynamic-list=" + rebase_path(inputs[0], root_build_dir) ] } } @@ -101,7 +99,5 @@ config("export_dynamic_symbols") { group("dist") { testonly = true - deps = [ - "$flutter_root/sky/dist", - ] + deps = [ "$flutter_root/sky/dist" ] } diff --git a/engine/flutter/common/BUILD.gn b/engine/flutter/common/BUILD.gn index b9b05073501d278ccb8cdf5f5e5de8b8a14c4a0e..8875e3e194a58e3e6e479f347d1941aba415732c 100644 --- a/engine/flutter/common/BUILD.gn +++ b/engine/flutter/common/BUILD.gn @@ -16,9 +16,7 @@ source_set("common") { "task_runners.h", ] - deps = [ - "$flutter_root/fml", - ] + deps = [ "$flutter_root/fml" ] public_configs = [ ":flutter_config", diff --git a/engine/flutter/flow/BUILD.gn b/engine/flutter/flow/BUILD.gn index 4028b566d87f75413e795e52191d3f69c7a9ea37..4c09d4be1cc2c49aa2985c93814a863ec020ff02 100644 --- a/engine/flutter/flow/BUILD.gn +++ b/engine/flutter/flow/BUILD.gn @@ -122,8 +122,8 @@ executable("flow_unittests") { ":flow", ":flow_fixtures", "$flutter_root/fml", + "$flutter_root/third_party/skia", "//third_party/dart/runtime:libdart_jit", # for tracing "//third_party/googletest:gtest", - "$flutter_root/third_party/skia", ] } diff --git a/engine/flutter/fml/BUILD.gn b/engine/flutter/fml/BUILD.gn index 85b18692a243b880b6ed32d33a7d83b87777a724..0b985c0b7e7a261a421b713d779970a6444f3422 100644 --- a/engine/flutter/fml/BUILD.gn +++ b/engine/flutter/fml/BUILD.gn @@ -232,9 +232,7 @@ executable("fml_unittests") { executable("fml_benchmarks") { testonly = true - sources = [ - "message_loop_task_queues_benchmark.cc", - ] + sources = [ "message_loop_task_queues_benchmark.cc" ] deps = [ "$flutter_root/benchmarking", diff --git a/engine/flutter/frontend_server/BUILD.gn b/engine/flutter/frontend_server/BUILD.gn index 7d3dfd5f6892ce347ad938543eed214481e48f3e..0e7b363173c2e8b5f5fa24f58a5ce842ad8045c5 100644 --- a/engine/flutter/frontend_server/BUILD.gn +++ b/engine/flutter/frontend_server/BUILD.gn @@ -10,9 +10,7 @@ if (is_fuchsia_host || is_fuchsia) { disable_analysis = true package_name = "frontend_server" - sources = [ - "server.dart", - ] + sources = [ "server.dart" ] deps = [ "//third_party/dart-pkg/pub/args", @@ -33,18 +31,14 @@ if (is_fuchsia_host || is_fuchsia) { sources = [] - deps = [ - ":frontend_server", - ] + deps = [ ":frontend_server" ] } } else { import("//third_party/dart/utils/application_snapshot.gni") application_snapshot("frontend_server") { main_dart = "bin/starter.dart" - deps = [ - "$flutter_root/lib/snapshot:kernel_platform_files", - ] + deps = [ "$flutter_root/lib/snapshot:kernel_platform_files" ] dot_packages = rebase_path(".packages") flutter_patched_sdk = rebase_path("$root_out_dir/flutter_patched_sdk") training_args = [ diff --git a/engine/flutter/lib/snapshot/BUILD.gn b/engine/flutter/lib/snapshot/BUILD.gn index 996878320854306d7e369f1ab2c86780b883ce9e..b28a9f212754a24646349366c0f761a550c09e75 100644 --- a/engine/flutter/lib/snapshot/BUILD.gn +++ b/engine/flutter/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") { @@ -29,12 +27,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" @@ -104,9 +98,7 @@ template("bin_to_assembly") { script, invoker.input, ] - outputs = [ - output, - ] + outputs = [ output ] } } @@ -145,12 +137,8 @@ template("bin_to_coff") { if (current_cpu == "x64") { args += [ "--64-bit" ] } - inputs = [ - invoker.input, - ] - outputs = [ - output, - ] + inputs = [ invoker.input ] + outputs = [ output ] } } @@ -169,45 +157,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" ] if ((is_fuchsia || is_fuchsia_host) && !using_fuchsia_sdk) { input = "$root_out_dir/flutter_runner_patched_sdk/platform_strong.dill" } else { @@ -275,14 +253,11 @@ compile_platform("strong_platform") { # Fuchsia's snapshot requires a different platform with extra dart: libraries. if ((is_fuchsia || is_fuchsia_host) && !using_fuchsia_sdk) { group("kernel_platform_files") { - public_deps = [ - "//topaz/runtime/flutter_runner/kernel:kernel_platform_files", - ] + public_deps = + [ "//topaz/runtime/flutter_runner/kernel:kernel_platform_files" ] } } else { group("kernel_platform_files") { - public_deps = [ - ":strong_platform", - ] + public_deps = [ ":strong_platform" ] } } diff --git a/engine/flutter/lib/ui/BUILD.gn b/engine/flutter/lib/ui/BUILD.gn index a11ed9116e8b921541983ae6c4f1e9a87fa4671a..98f2f87fdc1632b50638e0cf4fd5fe5a71329b82 100644 --- a/engine/flutter/lib/ui/BUILD.gn +++ b/engine/flutter/lib/ui/BUILD.gn @@ -118,9 +118,7 @@ source_set("ui") { "//third_party/tonic", ] - public_deps = [ - "$flutter_root/third_party/txt", - ] + public_deps = [ "$flutter_root/third_party/txt" ] if (flutter_enable_skshaper) { defines = [ "FLUTTER_ENABLE_SKSHAPER" ] @@ -156,9 +154,7 @@ if (current_toolchain == host_toolchain) { executable("ui_unittests") { testonly = true - sources = [ - "painting/image_decoder_unittests.cc", - ] + sources = [ "painting/image_decoder_unittests.cc" ] deps = [ ":ui", diff --git a/engine/flutter/runtime/BUILD.gn b/engine/flutter/runtime/BUILD.gn index 87147abde0071e8da580cc0b73501080d06fb8ee..8c12f2f533dd94cba9858a748f0f9ad9ba02c930 100644 --- a/engine/flutter/runtime/BUILD.gn +++ b/engine/flutter/runtime/BUILD.gn @@ -11,9 +11,7 @@ source_set("test_font") { "test_font_data.cc", "test_font_data.h", ] - deps = [ - "//third_party/skia", - ] + deps = [ "//third_party/skia" ] public_configs = [ "$flutter_root:config" ] defines = [] if (flutter_runtime_mode == "debug" || current_toolchain == host_toolchain) { @@ -87,9 +85,7 @@ source_set("runtime") { "//third_party/tonic", ] - public_deps = [ - "//third_party/rapidjson", - ] + public_deps = [ "//third_party/rapidjson" ] public_configs = [ "$flutter_root:config" ] @@ -142,7 +138,5 @@ executable("runtime_unittests") { "dart_vm_unittests.cc", ] - deps = [ - ":runtime_unittests_common", - ] + deps = [ ":runtime_unittests_common" ] } diff --git a/engine/flutter/shell/BUILD.gn b/engine/flutter/shell/BUILD.gn index e4bfd9e8fda5da104db95b559dcfd6894c85075e..0536023fbd0c1b79bc034edb24fe59f111ee852c 100644 --- a/engine/flutter/shell/BUILD.gn +++ b/engine/flutter/shell/BUILD.gn @@ -3,7 +3,5 @@ # found in the LICENSE file. group("shell") { - deps = [ - "platform", - ] + deps = [ "platform" ] } diff --git a/engine/flutter/shell/common/BUILD.gn b/engine/flutter/shell/common/BUILD.gn index bd4f7cae5ec52449582f523051ad293a37a0cbba..691803b297ba616cbede16b849a451450c9a8fd2 100644 --- a/engine/flutter/shell/common/BUILD.gn +++ b/engine/flutter/shell/common/BUILD.gn @@ -28,9 +28,7 @@ template("dart_embedder_resources") { } output = invoker.output - outputs = [ - output, - ] + outputs = [ output ] inputs = [ script ] + invoker.inputs @@ -172,9 +170,7 @@ if (current_toolchain == host_toolchain) { } shell_host_executable("shell_benchmarks") { - sources = [ - "shell_benchmarks.cc", - ] + sources = [ "shell_benchmarks.cc" ] deps = [ ":shell_unittests_fixtures", diff --git a/engine/flutter/shell/platform/BUILD.gn b/engine/flutter/shell/platform/BUILD.gn index 4b881909d14e265e7261a2669707e439a30c9333..a22df2923228cf7c82ff53e0a006666691dd3c3e 100644 --- a/engine/flutter/shell/platform/BUILD.gn +++ b/engine/flutter/shell/platform/BUILD.gn @@ -6,31 +6,21 @@ import("//build/fuchsia/sdk.gni") group("platform") { if (is_mac || is_ios) { - deps = [ - "darwin", - ] + deps = [ "darwin" ] } else if (is_android) { - deps = [ - "android", - ] + deps = [ "android" ] } else if (is_linux) { if (is_fuchsia_host) { # The linux build is not supported as part of the Fuchsia host build. deps = [] } else { - deps = [ - "linux", - ] + deps = [ "linux" ] } } else if (is_win) { - deps = [ - "windows", - ] + deps = [ "windows" ] } else if (is_fuchsia) { if (using_fuchsia_sdk) { - deps = [ - "fuchsia", - ] + deps = [ "fuchsia" ] } } else { assert(false, "Unknown/Unsupported platform.") diff --git a/engine/flutter/shell/platform/android/BUILD.gn b/engine/flutter/shell/platform/android/BUILD.gn index 6a286f356751f9593a15a4cebab5e6876d919f14..d95b6f36a15eed390af2fca5e14f314fcf7a8e78 100644 --- a/engine/flutter/shell/platform/android/BUILD.gn +++ b/engine/flutter/shell/platform/android/BUILD.gn @@ -96,9 +96,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", @@ -249,9 +247,7 @@ action("flutter_shell_java") { source_jar_path, source_jar_path + ".md5.stamp", ] - inputs = [ - android_sdk_jar, - ] + inputs = [ android_sdk_jar ] inputs += android_support_jars _rebased_current_path = rebase_path(".") @@ -273,9 +269,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") { @@ -284,13 +278,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", @@ -346,16 +336,12 @@ action("android") { action("pom_libflutter") { script = "$flutter_root/tools/android_support/generate_pom_file.py" - inputs = [ - "$flutter_root/tools/android_support/files.json", - ] + inputs = [ "$flutter_root/tools/android_support/files.json" ] artifact_id = string_replace(android_app_abi, "-", "_") + "_" + flutter_runtime_mode - outputs = [ - "$root_build_dir/$artifact_id-1.0.0-$engine_version.pom", - ] + outputs = [ "$root_build_dir/$artifact_id-1.0.0-$engine_version.pom" ] args = [ "--destination", @@ -370,15 +356,11 @@ action("pom_libflutter") { action("pom_embedding") { script = "$flutter_root/tools/android_support/generate_pom_file.py" - inputs = [ - "$flutter_root/tools/android_support/files.json", - ] + inputs = [ "$flutter_root/tools/android_support/files.json" ] artifact_id = "flutter_embedding_$flutter_runtime_mode" - outputs = [ - "$root_build_dir/$artifact_id-1.0.0-$engine_version.pom", - ] + outputs = [ "$root_build_dir/$artifact_id-1.0.0-$engine_version.pom" ] args = [ "--destination", diff --git a/engine/flutter/shell/platform/common/cpp/BUILD.gn b/engine/flutter/shell/platform/common/cpp/BUILD.gn index ac678700d86b6cdd1425830a77d034a7300b15d3..f66e4b85cb4600054ee27e3eae96ddff54bb40d2 100644 --- a/engine/flutter/shell/platform/common/cpp/BUILD.gn +++ b/engine/flutter/shell/platform/common/cpp/BUILD.gn @@ -57,7 +57,5 @@ source_set("common_cpp") { copy("publish_headers") { sources = _public_headers - outputs = [ - "$root_out_dir/{{source_file_part}}", - ] + outputs = [ "$root_out_dir/{{source_file_part}}" ] } diff --git a/engine/flutter/shell/platform/common/cpp/client_wrapper/BUILD.gn b/engine/flutter/shell/platform/common/cpp/client_wrapper/BUILD.gn index 5858f868991397777a04f38a5a1daeb2ff9edfeb..58587f77bb0e9d9fdcde5e07193324623f7deedb 100644 --- a/engine/flutter/shell/platform/common/cpp/client_wrapper/BUILD.gn +++ b/engine/flutter/shell/platform/common/cpp/client_wrapper/BUILD.gn @@ -34,9 +34,8 @@ source_set("client_wrapper_library_stubs") { defines = [ "FLUTTER_DESKTOP_LIBRARY" ] - public_deps = [ - "$flutter_root/shell/platform/common/cpp:common_cpp_library_headers", - ] + public_deps = + [ "$flutter_root/shell/platform/common/cpp:common_cpp_library_headers" ] } test_fixtures("client_wrapper_fixtures") { diff --git a/engine/flutter/shell/platform/darwin/BUILD.gn b/engine/flutter/shell/platform/darwin/BUILD.gn index efae1a9f1975cdf95ae768cd08d7ab6c26f13e23..a2d2146c6272fb4ab83533ac75b362cdc9a4ea90 100644 --- a/engine/flutter/shell/platform/darwin/BUILD.gn +++ b/engine/flutter/shell/platform/darwin/BUILD.gn @@ -8,14 +8,10 @@ import("$flutter_root/testing/testing.gni") group("darwin") { if (is_ios) { - deps = [ - "ios:flutter_framework", - ] + deps = [ "ios:flutter_framework" ] } if (is_mac) { - deps = [ - "macos", - ] + deps = [ "macos" ] } } diff --git a/engine/flutter/shell/platform/darwin/ios/BUILD.gn b/engine/flutter/shell/platform/darwin/ios/BUILD.gn index 3843b50960e6dd5fd64e07b71d4ba1f764fb334f..81cd63bf12dee63ef92fcc7451989ab9473a6863 100644 --- a/engine/flutter/shell/platform/darwin/ios/BUILD.gn +++ b/engine/flutter/shell/platform/darwin/ios/BUILD.gn @@ -139,16 +139,10 @@ shared_library("create_flutter_framework_dylib") { copy("copy_framework_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_dylib_and_update_framework_install_name") { @@ -156,12 +150,8 @@ action("copy_dylib_and_update_framework_install_name") { stamp_file = "$root_out_dir/flutter_install_name_stamp" script = "$flutter_root/sky/tools/change_install_name.py" - inputs = [ - "$_flutter_framework_dir/Flutter", - ] - outputs = [ - stamp_file, - ] + inputs = [ "$_flutter_framework_dir/Flutter" ] + outputs = [ stamp_file ] args = [ "--dylib", @@ -172,20 +162,14 @@ action("copy_dylib_and_update_framework_install_name") { rebase_path(stamp_file), ] - deps = [ - ":copy_framework_dylib", - ] + deps = [ ":copy_framework_dylib" ] } action("copy_framework_info_plist") { script = "$flutter_root/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]), @@ -195,12 +179,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") { @@ -222,44 +202,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/engine/flutter/shell/platform/darwin/macos/BUILD.gn b/engine/flutter/shell/platform/darwin/macos/BUILD.gn index 20d0961275ff6298d46488d8f48bf04663ccb787..143f590b6fffd5c324b26dd3c53ae7927c0d69b7 100644 --- a/engine/flutter/shell/platform/darwin/macos/BUILD.gn +++ b/engine/flutter/shell/platform/darwin/macos/BUILD.gn @@ -10,9 +10,7 @@ import("$flutter_root/shell/platform/darwin/common/framework_shared.gni") import("$flutter_root/shell/platform/glfw/config.gni") group("macos") { - deps = [ - ":flutter_framework", - ] + deps = [ ":flutter_framework" ] if (build_glfw_shell) { deps += [ ":flutter_macos_glfw", @@ -79,16 +77,10 @@ shared_library("create_flutter_framework_dylib") { copy("copy_framework_dylib") { visibility = [ ":*" ] - sources = [ - "$root_out_dir/lib$_flutter_framework_name.dylib", - ] - outputs = [ - "$_flutter_framework_dir/Versions/A/$_flutter_framework_name", - ] + sources = [ "$root_out_dir/lib$_flutter_framework_name.dylib" ] + outputs = [ "$_flutter_framework_dir/Versions/A/$_flutter_framework_name" ] - deps = [ - ":create_flutter_framework_dylib", - ] + deps = [ ":create_flutter_framework_dylib" ] } action("copy_dylib_and_update_framework_install_name") { @@ -96,12 +88,8 @@ action("copy_dylib_and_update_framework_install_name") { stamp_file = "$root_out_dir/flutter_install_name_stamp" script = "$flutter_root/sky/tools/change_install_name.py" - inputs = [ - "$_flutter_framework_dir/Versions/A/$_flutter_framework_name", - ] - outputs = [ - stamp_file, - ] + inputs = [ "$_flutter_framework_dir/Versions/A/$_flutter_framework_name" ] + outputs = [ stamp_file ] args = [ "--dylib", @@ -112,29 +100,19 @@ action("copy_dylib_and_update_framework_install_name") { rebase_path(stamp_file), ] - deps = [ - ":copy_framework_dylib", - ] + deps = [ ":copy_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") { @@ -156,30 +134,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", @@ -205,12 +174,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") { @@ -222,9 +187,7 @@ group("flutter_framework") { if (build_glfw_shell) { shared_library("flutter_macos_glfw") { - deps = [ - "$flutter_root/shell/platform/glfw:flutter_glfw", - ] + deps = [ "$flutter_root/shell/platform/glfw:flutter_glfw" ] public_configs = [ "$flutter_root:config" ] } diff --git a/engine/flutter/shell/platform/embedder/BUILD.gn b/engine/flutter/shell/platform/embedder/BUILD.gn index 1efe84661bd9569eb82dbdb968544b04cff94f5c..fd3db110e01f1c6decade167bb282d7170529cb8 100644 --- a/engine/flutter/shell/platform/embedder/BUILD.gn +++ b/engine/flutter/shell/platform/embedder/BUILD.gn @@ -125,21 +125,15 @@ shared_library("flutter_engine_library") { output_name = "flutter_engine" - deps = [ - ":embedder", - ] + deps = [ ":embedder" ] public_configs = [ "$flutter_root: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) { @@ -147,22 +141,14 @@ if (is_mac && !embedder_for_target) { copy("copy_dylib") { visibility = [ ":*" ] - sources = [ - "$root_out_dir/libflutter_engine.dylib", - ] - outputs = [ - "$_flutter_embedder_framework_dir/Versions/A/FlutterEmbedder", - ] - deps = [ - ":flutter_engine_library", - ] + sources = [ "$root_out_dir/libflutter_engine.dylib" ] + outputs = [ "$_flutter_embedder_framework_dir/Versions/A/FlutterEmbedder" ] + deps = [ ":flutter_engine_library" ] } copy("copy_framework_headers") { visibility = [ ":*" ] - sources = [ - "embedder.h", - ] + sources = [ "embedder.h" ] outputs = [ "$_flutter_embedder_framework_dir/Versions/A/Headers/FlutterEmbedder.h", ] @@ -170,23 +156,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_root/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]), @@ -196,9 +176,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", ] @@ -209,13 +187,9 @@ if (is_mac && !embedder_for_target) { stamp_file = "$root_build_dir/flutter_embedder_install_name_stamp" script = "$flutter_root/sky/tools/change_install_name.py" - inputs = [ - "$_flutter_embedder_framework_dir/Versions/A/FlutterEmbedder", - ] + inputs = [ "$_flutter_embedder_framework_dir/Versions/A/FlutterEmbedder" ] - outputs = [ - stamp_file, - ] + outputs = [ stamp_file ] args = [ "--dylib", @@ -226,17 +200,13 @@ if (is_mac && !embedder_for_target) { rebase_path(stamp_file), ] - deps = [ - ":copy_dylib", - ] + deps = [ ":copy_dylib" ] } 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", @@ -261,9 +231,7 @@ if (is_mac && !embedder_for_target) { group("flutter_embedder_framework") { visibility = [ ":*" ] - deps = [ - ":generate_symlinks", - ] + deps = [ ":generate_symlinks" ] } } diff --git a/engine/flutter/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn b/engine/flutter/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn index 96ee6bc04f076fb147af76a0c419675f915bc87b..ddf677ffde2d508b8b2711a438f68e67fbbd6848 100644 --- a/engine/flutter/shell/platform/fuchsia/dart-pkg/fuchsia/BUILD.gn +++ b/engine/flutter/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/engine/flutter/shell/platform/fuchsia/dart/BUILD.gn b/engine/flutter/shell/platform/fuchsia/dart/BUILD.gn index 3116502547e53852df5b68b6f8b070624eb1fa0c..d619283c640b69b7347adb392c5434fafdae38d1 100644 --- a/engine/flutter/shell/platform/fuchsia/dart/BUILD.gn +++ b/engine/flutter/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/.packages") diff --git a/engine/flutter/shell/platform/fuchsia/dart_runner/embedder/BUILD.gn b/engine/flutter/shell/platform/fuchsia/dart_runner/embedder/BUILD.gn index 53ad9b4bc86dc5207b9bde55f3de64265e253a86..bd052e29e7de8549cfa050ab74cd1f547c434079 100644 --- a/engine/flutter/shell/platform/fuchsia/dart_runner/embedder/BUILD.gn +++ b/engine/flutter/shell/platform/fuchsia/dart_runner/embedder/BUILD.gn @@ -50,12 +50,8 @@ template("create_aot_snapshot") { shim_kernel = get_label_info(shim_target, "target_gen_dir") + "/shim${product_suffix}_kernel.dil" - inputs = [ - shim_kernel, - ] - outputs = [ - snapshot_assembly, - ] + inputs = [ shim_kernel ] + outputs = [ snapshot_assembly ] deps = gen_snapshot_deps + [ shim_target ] if (invoker.product) { @@ -81,9 +77,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/engine/flutter/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/BUILD.gn b/engine/flutter/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/BUILD.gn index f8a76c2436c20b14302056081e2cef410fad81e1..8e856ad91271f4452081d77ef549588332af0601 100644 --- a/engine/flutter/shell/platform/fuchsia/dart_runner/examples/goodbye_dart/BUILD.gn +++ b/engine/flutter/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/engine/flutter/shell/platform/fuchsia/dart_runner/examples/greeting/BUILD.gn b/engine/flutter/shell/platform/fuchsia/dart_runner/examples/greeting/BUILD.gn index 082624f0874455dac78c62cb63ef5bd885cd34dd..067f8d4a671126dcd947b05e24a4452d4f104c21 100644 --- a/engine/flutter/shell/platform/fuchsia/dart_runner/examples/greeting/BUILD.gn +++ b/engine/flutter/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/engine/flutter/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/interfaces/BUILD.gn b/engine/flutter/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/interfaces/BUILD.gn index 19ac79665f66419fdccae8420103fb986b9fc417..49e3a43fd4a742d1021d0e7966df99eeed2fec84 100644 --- a/engine/flutter/shell/platform/fuchsia/dart_runner/examples/hello_app_dart/interfaces/BUILD.gn +++ b/engine/flutter/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/engine/flutter/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn b/engine/flutter/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn index 1c2029500fcb243d3c01d438977a08748f5feeb1..c21bed2672804dd320d554f50a55a49a6809c891 100644 --- a/engine/flutter/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn +++ b/engine/flutter/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn @@ -36,9 +36,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/engine/flutter/shell/platform/fuchsia/flutter/BUILD.gn b/engine/flutter/shell/platform/fuchsia/flutter/BUILD.gn index 90ba1e87b5c300c4da8bee2016b5517fc656d8a1..8489bc80119f5018b6b6b91701fba6e8b45557a1 100644 --- a/engine/flutter/shell/platform/fuchsia/flutter/BUILD.gn +++ b/engine/flutter/shell/platform/fuchsia/flutter/BUILD.gn @@ -282,9 +282,7 @@ template("aot_runner") { } package_dir(target_name) { - deps = [ - ":aot${product_suffix}", - ] + deps = [ ":aot${product_suffix}" ] if (!product) { deps += [ observatory_target ] diff --git a/engine/flutter/shell/platform/fuchsia/flutter/kernel/BUILD.gn b/engine/flutter/shell/platform/fuchsia/flutter/kernel/BUILD.gn index 75d470f378ec6de31032d50d372c7a746ada5583..91d5bcd63382908e757e09b2fe6d9af77ccf7d95 100644 --- a/engine/flutter/shell/platform/fuchsia/flutter/kernel/BUILD.gn +++ b/engine/flutter/shell/platform/fuchsia/flutter/kernel/BUILD.gn @@ -39,9 +39,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/engine/flutter/shell/platform/glfw/BUILD.gn b/engine/flutter/shell/platform/glfw/BUILD.gn index 3a2d254f746e122275a648118905a1b1a463ef96..604108c3629a6c2ac14f21b0a89105729862524a 100644 --- a/engine/flutter/shell/platform/glfw/BUILD.gn +++ b/engine/flutter/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_root/shell/platform/common/cpp:common_cpp_library_headers", - ] + public_deps = + [ "$flutter_root/shell/platform/common/cpp:common_cpp_library_headers" ] configs += [ "$flutter_root/shell/platform/common/cpp:desktop_library_implementation", @@ -77,12 +76,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_root/shell/platform/common/cpp:publish_headers", - ] + deps = [ "$flutter_root/shell/platform/common/cpp:publish_headers" ] } diff --git a/engine/flutter/shell/platform/glfw/client_wrapper/BUILD.gn b/engine/flutter/shell/platform/glfw/client_wrapper/BUILD.gn index 6eb4d4ca9a6304ccfac4af3fdd2af613b7674218..0789403621cc2166fcdebe91417415af95030e9b 100644 --- a/engine/flutter/shell/platform/glfw/client_wrapper/BUILD.gn +++ b/engine/flutter/shell/platform/glfw/client_wrapper/BUILD.gn @@ -68,9 +68,7 @@ source_set("client_wrapper_library_stubs_glfw") { defines = [ "FLUTTER_DESKTOP_LIBRARY" ] - public_deps = [ - "$flutter_root/shell/platform/glfw:flutter_glfw_headers", - ] + public_deps = [ "$flutter_root/shell/platform/glfw:flutter_glfw_headers" ] } test_fixtures("client_wrapper_glfw_fixtures") { @@ -81,9 +79,7 @@ executable("client_wrapper_glfw_unittests") { testonly = true # TODO: Add more unit tests. - sources = [ - "flutter_window_controller_unittests.cc", - ] + sources = [ "flutter_window_controller_unittests.cc" ] deps = [ ":client_wrapper_glfw", diff --git a/engine/flutter/shell/platform/linux/BUILD.gn b/engine/flutter/shell/platform/linux/BUILD.gn index cc23d93d6d0ba1d04c6d557b7e5605a937ea6f31..ff609f60a58a3b5586658e8880d0936314973021 100644 --- a/engine/flutter/shell/platform/linux/BUILD.gn +++ b/engine/flutter/shell/platform/linux/BUILD.gn @@ -32,9 +32,7 @@ if (build_glfw_shell) { # TODO: Remove this target once the _glfw copy is being uploaded instead. See # https://github.com/flutter/flutter/issues/38589 shared_library("flutter_linux") { - deps = [ - "$flutter_root/shell/platform/glfw:flutter_glfw", - ] + deps = [ "$flutter_root/shell/platform/glfw:flutter_glfw" ] configs += [ ":disable_fatal_link_warnings" ] @@ -42,9 +40,7 @@ if (build_glfw_shell) { } shared_library("flutter_linux_glfw") { - deps = [ - "$flutter_root/shell/platform/glfw:flutter_glfw", - ] + deps = [ "$flutter_root/shell/platform/glfw:flutter_glfw" ] configs += [ ":disable_fatal_link_warnings" ] diff --git a/engine/flutter/shell/platform/ohos/ohos_surface.h b/engine/flutter/shell/platform/ohos/ohos_surface.h index 599dea11b2df9db5b9c67988debeaf547cba3ff5..158f6d219da55b5edace2e6f70f4783de031d81d 100644 --- a/engine/flutter/shell/platform/ohos/ohos_surface.h +++ b/engine/flutter/shell/platform/ohos/ohos_surface.h @@ -27,7 +27,7 @@ class OhosSurface { virtual bool OnScreenSurfaceResize(const SkISize& size) = 0; - virtual void SetPlatformWindow(::OHOS::Window* window) = 0; + virtual void SetPlatformWindow(const ::OHOS::sptr<::OHOS::Window> &window) = 0; }; } // namespace flutter diff --git a/engine/flutter/shell/platform/ohos/ohos_surface_software.cc b/engine/flutter/shell/platform/ohos/ohos_surface_software.cc index 1667986cc0e6cb62b173b876b81fc5456ed2ec01..80531c58a0b460fe2dcbfa9c55ee013cfdba4578 100644 --- a/engine/flutter/shell/platform/ohos/ohos_surface_software.cc +++ b/engine/flutter/shell/platform/ohos/ohos_surface_software.cc @@ -17,7 +17,6 @@ namespace flutter { namespace { - bool GetSkColorType(int32_t buffer_format, SkColorType* color_type, SkAlphaType* alpha_type) @@ -36,7 +35,6 @@ bool GetSkColorType(int32_t buffer_format, } return false; } - } // anonymous namespace OhosSurfaceSoftware::OhosSurfaceSoftware() @@ -71,19 +69,25 @@ bool OhosSurfaceSoftware::OnScreenSurfaceResize(const SkISize& size) return true; } -void OhosSurfaceSoftware::SetPlatformWindow(OHOS::Window* window) +void OhosSurfaceSoftware::SetPlatformWindow(const OHOS::sptr &window) { if (window == nullptr) { FML_LOG(ERROR) << "OhosSurfaceSoftware::SetPlatformWindow, window is nullptr"; return; } window_ = window; - window_->GetRequestConfig(requestConfig_); surface_ = window->GetSurface(); if (surface_ == nullptr) { FML_LOG(ERROR) << "OhosSurfaceSoftware::SetPlatformWindow, surface_ is nullptr"; return; } + requestConfig_ = { + .width = surface_->GetDefaultWidth(), + .height = surface_->GetDefaultHeight(), + .strideAlignment = 0x8, + .format = PIXEL_FMT_RGBA_8888, + .usage = surface_->GetDefaultUsage(), + }; // Set buffer size to 5 for enough buffer surface_->SetQueueSize(5); } diff --git a/engine/flutter/shell/platform/ohos/ohos_surface_software.h b/engine/flutter/shell/platform/ohos/ohos_surface_software.h index 60a5ab7cc8be84c7f642da23eebfc54844b71763..3943999f5ea150b241cabb64345bfb77efe4f6b0 100644 --- a/engine/flutter/shell/platform/ohos/ohos_surface_software.h +++ b/engine/flutter/shell/platform/ohos/ohos_surface_software.h @@ -12,43 +12,42 @@ #include "flutter/shell/platform/ohos/ohos_surface.h" namespace flutter { - class OhosSurfaceSoftware final : public OhosSurface, public GPUSurfaceSoftwareDelegate { public: OhosSurfaceSoftware(); - ~OhosSurfaceSoftware() override = default; + ~OhosSurfaceSoftware() override = default; - bool IsValid() const override; + bool IsValid() const override; - std::unique_ptr CreateGPUSurface() override; + std::unique_ptr CreateGPUSurface() override; - bool OnScreenSurfaceResize(const SkISize& size) override; + bool OnScreenSurfaceResize(const SkISize& size) override; - void SetPlatformWindow(OHOS::Window* window) override; + void SetPlatformWindow(const OHOS::sptr &window) override; - sk_sp AcquireBackingStore(const SkISize& size) override; + sk_sp AcquireBackingStore(const SkISize& size) override; - bool PresentBackingStore(sk_sp backing_store) override; + bool PresentBackingStore(sk_sp backing_store) override; - void SurfaceDrawBuffer( + void SurfaceDrawBuffer( OHOS::BufferRequestConfig& requestConfig, OHOS::sptr surfaceBuffer, SkPixmap& pixmap); - void SurfaceFlushBuffer(OHOS::sptr); + void SurfaceFlushBuffer(OHOS::sptr); - ExternalViewEmbedder* GetExternalViewEmbedder() override; + ExternalViewEmbedder* GetExternalViewEmbedder() override; private: sk_sp sk_surface_; - SkColorType target_color_type_; - SkAlphaType target_alpha_type_; + SkColorType target_color_type_; + SkAlphaType target_alpha_type_; - OHOS::Window* window_ = nullptr; - OHOS::BufferRequestConfig requestConfig_; - OHOS::sptr surface_ = nullptr; + OHOS::sptr window_ = nullptr; + OHOS::BufferRequestConfig requestConfig_; + OHOS::sptr surface_ = nullptr; - FML_DISALLOW_COPY_AND_ASSIGN(OhosSurfaceSoftware); + FML_DISALLOW_COPY_AND_ASSIGN(OhosSurfaceSoftware); }; } // namespace flutter diff --git a/engine/flutter/shell/platform/ohos/platform_view_ohos.cc b/engine/flutter/shell/platform/ohos/platform_view_ohos.cc index 54c227c6506b341a7b4e1bbd9760fa3ed1dbd652..862e1a251cb9c410767b97a7ea172eb08f7068b6 100644 --- a/engine/flutter/shell/platform/ohos/platform_view_ohos.cc +++ b/engine/flutter/shell/platform/ohos/platform_view_ohos.cc @@ -26,7 +26,7 @@ PlatformViewOhos::PlatformViewOhos( } } -void PlatformViewOhos::NotifyCreated(::OHOS::Window* window) +void PlatformViewOhos::NotifyCreated(const ::OHOS::sptr<::OHOS::Window> &window) { if (surface_) { surface_->SetPlatformWindow(window); diff --git a/engine/flutter/shell/platform/ohos/platform_view_ohos.h b/engine/flutter/shell/platform/ohos/platform_view_ohos.h index 9bbbb02d37ed74186c75c738f3eedcaf0ac5a476..1db430537c059eb93ab351a3b4af7ea35e60aeac 100644 --- a/engine/flutter/shell/platform/ohos/platform_view_ohos.h +++ b/engine/flutter/shell/platform/ohos/platform_view_ohos.h @@ -16,7 +16,7 @@ class PlatformViewOhos final : public PlatformView { public: PlatformViewOhos(PlatformView::Delegate& delegate, flutter::TaskRunners task_runners, bool use_software_rendering); - void NotifyCreated(::OHOS::Window* window); + void NotifyCreated(const ::OHOS::sptr<::OHOS::Window> &window); void NotifyChanged(const SkISize& size); std::unique_ptr CreateRenderingSurface(); std::unique_ptr CreateVSyncWaiter(int32_t platform); diff --git a/engine/flutter/shell/platform/windows/BUILD.gn b/engine/flutter/shell/platform/windows/BUILD.gn index 9c65762b8be3695faef3bb5bf8b0adb03e13bf6b..7bc108eacdfb60cb45b0c8732cc099444c14a189 100644 --- a/engine/flutter/shell/platform/windows/BUILD.gn +++ b/engine/flutter/shell/platform/windows/BUILD.gn @@ -25,9 +25,8 @@ config("relative_flutter_windows_headers") { source_set("flutter_windows_headers") { public = _public_headers - public_deps = [ - "$flutter_root/shell/platform/common/cpp:common_cpp_library_headers", - ] + public_deps = + [ "$flutter_root/shell/platform/common/cpp:common_cpp_library_headers" ] configs += [ "$flutter_root/shell/platform/common/cpp:desktop_library_implementation", @@ -74,7 +73,11 @@ source_set("flutter_windows_source") { "$flutter_root/shell/platform/common/cpp/client_wrapper:client_wrapper", "$flutter_root/shell/platform/embedder:embedder_with_symbol_prefix", "$flutter_root/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", ] @@ -82,20 +85,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_root/shell/platform/common/cpp:publish_headers", - ] + deps = [ "$flutter_root/shell/platform/common/cpp:publish_headers" ] } shared_library("flutter_windows_win32") { - deps = [ - ":flutter_windows_source", - ] + deps = [ ":flutter_windows_source" ] public_configs = [ "$flutter_root:config" ] } @@ -103,17 +100,13 @@ shared_library("flutter_windows_win32") { # TODO: Remove this target once the _glfw copy is being uploaded instead. See # https://github.com/flutter/flutter/issues/38589 shared_library("flutter_windows") { - deps = [ - "$flutter_root/shell/platform/glfw:flutter_glfw", - ] + deps = [ "$flutter_root/shell/platform/glfw:flutter_glfw" ] public_configs = [ "$flutter_root:config" ] } shared_library("flutter_windows_glfw") { - deps = [ - "$flutter_root/shell/platform/glfw:flutter_glfw", - ] + deps = [ "$flutter_root/shell/platform/glfw:flutter_glfw" ] public_configs = [ "$flutter_root:config" ] } @@ -137,9 +130,7 @@ group("windows_glfw") { } group("windows") { - deps = [ - ":windows_win32", - ] + deps = [ ":windows_win32" ] if (build_glfw_shell) { deps += [ ":windows_glfw" ] } diff --git a/engine/flutter/shell/platform/windows/client_wrapper/BUILD.gn b/engine/flutter/shell/platform/windows/client_wrapper/BUILD.gn index bbd48c67df33ad0704862ff84bb0769a673c5123..116d6b67c8460a0b08a282dedd1fd1054d0d20d6 100644 --- a/engine/flutter/shell/platform/windows/client_wrapper/BUILD.gn +++ b/engine/flutter/shell/platform/windows/client_wrapper/BUILD.gn @@ -56,9 +56,8 @@ source_set("client_wrapper_library_stubs_windows") { defines = [ "FLUTTER_DESKTOP_LIBRARY" ] - public_deps = [ - "$flutter_root/shell/platform/windows:flutter_windows_headers", - ] + public_deps = + [ "$flutter_root/shell/platform/windows:flutter_windows_headers" ] } test_fixtures("client_wrapper_windows_fixtures") { @@ -69,9 +68,7 @@ executable("client_wrapper_windows_unittests") { testonly = true # TODO: Add more unit tests. - sources = [ - "flutter_window_controller_unittests.cc", - ] + sources = [ "flutter_window_controller_unittests.cc" ] deps = [ ":client_wrapper_library_stubs_windows", diff --git a/engine/flutter/shell/testing/BUILD.gn b/engine/flutter/shell/testing/BUILD.gn index 9daca896faf3278794d88278392cc88df1aaa2ea..f84a5f984ca49cf2103ecff6824b6c9429876f26 100644 --- a/engine/flutter/shell/testing/BUILD.gn +++ b/engine/flutter/shell/testing/BUILD.gn @@ -14,9 +14,7 @@ executable("testing") { "$flutter_root:export_dynamic_symbols", ] - sources = [ - "tester_main.cc", - ] + sources = [ "tester_main.cc" ] deps = [ "$flutter_root/assets", diff --git a/engine/flutter/sky/BUILD.gn b/engine/flutter/sky/BUILD.gn index b950560f5a0803645e3f202c3815d7a401a72258..e40da9cab65336ba25a48f9d645be6ad195d4fdf 100644 --- a/engine/flutter/sky/BUILD.gn +++ b/engine/flutter/sky/BUILD.gn @@ -5,9 +5,7 @@ group("sky") { testonly = true - deps = [ - "$flutter_root/sky/packages", - ] + deps = [ "$flutter_root/sky/packages" ] if (!is_fuchsia) { deps += [ "$flutter_root/shell" ] diff --git a/engine/flutter/sky/dist/BUILD.gn b/engine/flutter/sky/dist/BUILD.gn index c1b564a03ecce124dc17d66b2dafdb3c8628d241..d2c1655941e1ddfbed46c4c5768d666e21ef00d7 100644 --- a/engine/flutter/sky/dist/BUILD.gn +++ b/engine/flutter/sky/dist/BUILD.gn @@ -9,12 +9,8 @@ if (is_android) { source = "$flutter_root/sky/packages/flutter_services" dest = "$root_build_dir/dist/packages/flutter_services" - inputs = [ - source, - ] - outputs = [ - dest, - ] + inputs = [ source ] + outputs = [ dest ] args = [ "--source", @@ -23,9 +19,7 @@ if (is_android) { rebase_path(dest), ] - deps = [ - "$flutter_root/sky/packages/flutter_services", - ] + deps = [ "$flutter_root/sky/packages/flutter_services" ] } action("sky_engine") { script = "$flutter_root/sky/tools/dist_dart_pkg.py" @@ -33,12 +27,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", @@ -59,12 +49,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", diff --git a/engine/flutter/sky/packages/flutter_services/BUILD.gn b/engine/flutter/sky/packages/flutter_services/BUILD.gn index 6ec4f4b2e4504dea13226925034995f000c72628..81019e2dabea7c92938bc1ebcc45c4fab8fff85b 100644 --- a/engine/flutter/sky/packages/flutter_services/BUILD.gn +++ b/engine/flutter/sky/packages/flutter_services/BUILD.gn @@ -3,7 +3,5 @@ # found in the LICENSE file. group("flutter_services") { - deps = [ - "$flutter_root/sky/packages/sky_services", - ] + deps = [ "$flutter_root/sky/packages/sky_services" ] } diff --git a/engine/flutter/sky/packages/sky_engine/BUILD.gn b/engine/flutter/sky/packages/sky_engine/BUILD.gn index 031cdbe979b50687e9490145d5db0579262ae2c0..641960294fd3b1730c9ee2528d563170d4501169 100644 --- a/engine/flutter/sky/packages/sky_engine/BUILD.gn +++ b/engine/flutter/sky/packages/sky_engine/BUILD.gn @@ -19,13 +19,9 @@ import("$flutter_root/lib/ui/dart_ui.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}}" ] } } @@ -34,9 +30,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") { @@ -50,73 +45,62 @@ 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("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("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("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") { @@ -130,9 +114,7 @@ copy("typed_data") { 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}}" ] } group("copy_dart_sdk") { diff --git a/engine/flutter/sky/packages/sky_services/BUILD.gn b/engine/flutter/sky/packages/sky_services/BUILD.gn index 73ecf5668e0cbfb07f1948c5ae3d05974639d6b6..c490e68a125d8fa1bb47905f31dfb73b93cd6726 100644 --- a/engine/flutter/sky/packages/sky_services/BUILD.gn +++ b/engine/flutter/sky/packages/sky_services/BUILD.gn @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. - if (!is_fuchsia) { copy("copy_sky_services_license") { sources = [ @@ -10,9 +9,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}}" ] } } @@ -23,8 +20,6 @@ dart_pkg("sky_services") { ] if (!is_fuchsia) { - deps = [ - ":copy_sky_services_license", - ] + deps = [ ":copy_sky_services_license" ] } } diff --git a/engine/flutter/testing/BUILD.gn b/engine/flutter/testing/BUILD.gn index b613afee0348c29d9823c672906ee2f38ec217ec..59140d5952e0f1f58f953a67aad80346f852fcc4 100644 --- a/engine/flutter/testing/BUILD.gn +++ b/engine/flutter/testing/BUILD.gn @@ -27,9 +27,7 @@ source_set("testing") { "$flutter_root/testing/thread_test.h", ] - public_deps = [ - ":testing_lib", - ] + public_deps = [ ":testing_lib" ] } source_set("dart") { diff --git a/engine/flutter/third_party/txt/BUILD.gn b/engine/flutter/third_party/txt/BUILD.gn index d77d4b9c9f41da945ed24d58de061550ce503e79..5284c53397d0b5eff4a8e1f4229c6b8b0bddd02b 100644 --- a/engine/flutter/third_party/txt/BUILD.gn +++ b/engine/flutter/third_party/txt/BUILD.gn @@ -130,9 +130,7 @@ source_set("txt") { "//third_party/skia", ] - deps = [ - "//third_party/skia", - ] + deps = [ "//third_party/skia" ] if (flutter_use_fontconfig) { deps += [ "//third_party/fontconfig" ] @@ -164,8 +162,8 @@ source_set("txt") { } txt_common_executable_deps = [ - "//third_party/dart/runtime:libdart_jit", # For logging. "$flutter_root/fml", # For ICU initialization. + "//third_party/dart/runtime:libdart_jit", # For logging. ] source_set("txt_test_utils") { diff --git a/engine/flutter/web_sdk/BUILD.gn b/engine/flutter/web_sdk/BUILD.gn index 588594204d45120e54f4e462d4bc9f1f1156ce66..cd4bc24c744b38b32b90e62ad9cabc33e0894587 100644 --- a/engine/flutter/web_sdk/BUILD.gn +++ b/engine/flutter/web_sdk/BUILD.gn @@ -51,9 +51,7 @@ prebuilt_dart_action("web_ui_sources") { "--ui", ] - outputs = [ - "$root_out_dir/flutter_web_engine_sdk_stamp", - ] + outputs = [ "$root_out_dir/flutter_web_engine_sdk_stamp" ] foreach(source_file, web_ui_sources) { path = rebase_path(source_file) @@ -75,9 +73,7 @@ prebuilt_dart_action("web_engine_sources") { "--engine", ] - outputs = [ - "$root_out_dir/flutter_web_sdk_stamp", - ] + outputs = [ "$root_out_dir/flutter_web_sdk_stamp" ] foreach(source_file, web_engine_sources) { path = rebase_path(source_file) @@ -86,13 +82,9 @@ prebuilt_dart_action("web_engine_sources") { } copy("web_ui_library") { - sources = [ - "$flutter_root/web_sdk/libraries.json", - ] + sources = [ "$flutter_root/web_sdk/libraries.json" ] - outputs = [ - "$root_out_dir/flutter_web_sdk/{{source_file_part}}", - ] + outputs = [ "$root_out_dir/flutter_web_sdk/{{source_file_part}}" ] } prebuilt_dart_action("flutter_dartdevc_kernel_sdk") { @@ -102,9 +94,7 @@ prebuilt_dart_action("flutter_dartdevc_kernel_sdk") { "//third_party/dart/utils/dartdevc:dartdevc_sdk_patch_stamp", ] - inputs = [ - "//third_party/dart/pkg/dev_compiler/tool/kernel_sdk.dart", - ] + inputs = [ "//third_party/dart/pkg/dev_compiler/tool/kernel_sdk.dart" ] outputs = [ sdk_dill, diff --git a/flutter/examples/flutter_gallery/BUILD.gn b/flutter/examples/flutter_gallery/BUILD.gn index fca749b3ba32f42fa648afc232781cb8b61edb0a..f64277149d455d60161c81fc6cfc5a8b6dfb0d39 100644 --- a/flutter/examples/flutter_gallery/BUILD.gn +++ b/flutter/examples/flutter_gallery/BUILD.gn @@ -41,5 +41,4 @@ flutter_app("flutter_gallery") { "//third_party/dart-pkg/pub/video_player", "//third_party/dart/third_party/pkg/intl", ] - } diff --git a/flutter/packages/flutter/BUILD.gn b/flutter/packages/flutter/BUILD.gn index 6bbb0f3209c7f90b1cb1de125dcc112903a9aa84..5b11e9ccb4b0c86e8db60f9b7d3e6007b44d0065 100644 --- a/flutter/packages/flutter/BUILD.gn +++ b/flutter/packages/flutter/BUILD.gn @@ -13,12 +13,12 @@ dart_library("flutter") { disable_analysis = true deps = [ - "//third_party/dart/third_party/pkg/intl", "//third_party/dart-pkg/pub/async", "//third_party/dart-pkg/pub/collection", "//third_party/dart-pkg/pub/meta", "//third_party/dart-pkg/pub/typed_data", "//third_party/dart-pkg/pub/vector_math", + "//third_party/dart/third_party/pkg/intl", ] if (is_fuchsia) { diff --git a/flutter/packages/flutter_driver/BUILD.gn b/flutter/packages/flutter_driver/BUILD.gn index 818d779c7ca2ba05106ea26f729fc56de7b9cddc..234d9580e2a81ced07a17907e6a774ca35637430 100644 --- a/flutter/packages/flutter_driver/BUILD.gn +++ b/flutter/packages/flutter_driver/BUILD.gn @@ -20,8 +20,8 @@ dart_library("flutter_driver") { "//third_party/dart-pkg/pub/json_rpc_2", "//third_party/dart-pkg/pub/meta", "//third_party/dart-pkg/pub/path", - "//third_party/dart-pkg/pub/web_socket_channel", "//third_party/dart-pkg/pub/vm_service_client", + "//third_party/dart-pkg/pub/web_socket_channel", ] if (is_fuchsia) { diff --git a/flutter/packages/flutter_tools/BUILD.gn b/flutter/packages/flutter_tools/BUILD.gn index 910e06878983db64c364d94a0e764724bbeb1d7d..c1ecfad98859565f2b98f03c8ddb25e7755750dd 100644 --- a/flutter/packages/flutter_tools/BUILD.gn +++ b/flutter/packages/flutter_tools/BUILD.gn @@ -25,6 +25,7 @@ dart_library("flutter_tools") { "//third_party/dart-pkg/pub/crypto", "//third_party/dart-pkg/pub/dwds", "//third_party/dart-pkg/pub/file", + # The HTTP dependency is removed because http doesn't work on Fuchsia # because it uses mirrors which Fuchsia's Dart VM doesn't support. "//third_party/dart-pkg/pub/json_rpc_2", @@ -35,6 +36,7 @@ dart_library("flutter_tools") { "//third_party/dart-pkg/pub/multi_server_socket", "//third_party/dart-pkg/pub/multicast_dns", "//third_party/dart-pkg/pub/mustache", + "//third_party/dart-pkg/pub/node_preamble", "//third_party/dart-pkg/pub/package_config", "//third_party/dart-pkg/pub/path", "//third_party/dart-pkg/pub/platform", @@ -50,7 +52,6 @@ dart_library("flutter_tools") { "//third_party/dart-pkg/pub/webkit_inspection_protocol", "//third_party/dart-pkg/pub/xml", "//third_party/dart-pkg/pub/yaml", - "//third_party/dart-pkg/pub/node_preamble", ] } @@ -59,9 +60,7 @@ dart_tool("fuchsia_builder") { disable_analysis = true - deps = [ - ":flutter_tools", - ] + deps = [ ":flutter_tools" ] } dart_tool("fuchsia_asset_builder") { @@ -147,9 +146,7 @@ dart_tool("fuchsia_asset_builder") { "src/vscode/vscode_validator.dart", ] - deps = [ - ":flutter_tools", - ] + deps = [ ":flutter_tools" ] } dart_tool("fuchsia_tester") { @@ -239,13 +236,9 @@ dart_tool("fuchsia_tester") { "src/vscode/vscode_validator.dart", ] - deps = [ - ":flutter_tools", - ] + deps = [ ":flutter_tools" ] - non_dart_deps = [ - "$flutter_root/shell", - ] + non_dart_deps = [ "$flutter_root/shell" ] } dart_tool("fuchsia_attach") { @@ -257,11 +250,7 @@ dart_tool("fuchsia_attach") { disable_analysis = true - deps = [ - ":flutter_tools", - ] + deps = [ ":flutter_tools" ] - non_dart_deps = [ - "//third_party/flutter/frontend_server:frontend_server_tool_snapshot($host_toolchain)", - ] + non_dart_deps = [ "//third_party/flutter/frontend_server:frontend_server_tool_snapshot($host_toolchain)" ] } diff --git a/skia/BUILD.gn b/skia/BUILD.gn index b14ab3c7394642378e3b0558b7fd77b5a973d161..b7bf57b6ade8e88f256c5a21e8e4ab3673a449bb 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -359,9 +359,7 @@ optional("fontmgr_android") { optional("fontmgr_custom") { enabled = skia_enable_fontmgr_custom - deps = [ - ":typeface_freetype", - ] + deps = [ ":typeface_freetype" ] sources = [ "src/ports/SkFontMgr_custom.cpp", "src/ports/SkFontMgr_custom.h", @@ -375,9 +373,7 @@ optional("fontmgr_custom") { optional("fontmgr_custom_empty") { enabled = skia_enable_fontmgr_custom_empty - deps = [ - ":typeface_freetype", - ] + deps = [ ":typeface_freetype" ] sources = [ "src/ports/SkFontMgr_custom.cpp", "src/ports/SkFontMgr_custom_empty.cpp", @@ -387,9 +383,7 @@ optional("fontmgr_custom_empty") { optional("fontmgr_empty") { enabled = skia_enable_fontmgr_empty - sources = [ - "src/ports/SkFontMgr_empty_factory.cpp", - ] + sources = [ "src/ports/SkFontMgr_empty_factory.cpp" ] } optional("fontmgr_fontconfig") { @@ -428,9 +422,7 @@ optional("fontmgr_fuchsia") { optional("fontmgr_wasm") { enabled = !skia_enable_fontmgr_empty && target_cpu == "wasm" - deps = [ - ":typeface_freetype", - ] + deps = [ ":typeface_freetype" ] sources = [ "src/ports/SkFontMgr_custom.cpp", "src/ports/SkFontMgr_custom.h", @@ -454,9 +446,7 @@ optional("fontmgr_win") { optional("fontmgr_win_gdi") { enabled = skia_enable_fontmgr_win_gdi - sources = [ - "src/ports/SkFontHost_win.cpp", - ] + sources = [ "src/ports/SkFontHost_win.cpp" ] libs = [ "Gdi32.lib" ] } @@ -473,12 +463,8 @@ if (skia_lex) { action("run_sksllex") { script = "gn/run_sksllex.py" - deps = [ - ":sksllex(//gn/toolchain:$host_toolchain)", - ] - sources = [ - "src/sksl/lex/sksl.lex", - ] + deps = [ ":sksllex(//gn/toolchain:$host_toolchain)" ] + sources = [ "src/sksl/lex/sksl.lex" ] # GN insists its outputs should go somewhere underneath target_out_dir, so we trick it with a # path that starts with target_out_dir and then uses ".." to back up into the src dir. @@ -507,9 +493,7 @@ if (skia_lex) { if (skia_compile_processors) { executable("skslc") { defines = [ "SKSL_STANDALONE" ] - sources = [ - "src/sksl/SkSLMain.cpp", - ] + sources = [ "src/sksl/SkSLMain.cpp" ] sources += skia_sksl_sources sources += skia_sksl_gpu_sources include_dirs = [ "." ] @@ -536,13 +520,9 @@ if (skia_compile_processors) { action("create_sksl_enums") { script = "gn/create_sksl_enums.py" - sources = [ - "include/private/GrSharedEnums.h", - ] - outputs = [ - "$target_out_dir/" + - rebase_path("src/sksl/sksl_enums.inc", target_out_dir), - ] + sources = [ "include/private/GrSharedEnums.h" ] + outputs = [ "$target_out_dir/" + + rebase_path("src/sksl/sksl_enums.inc", target_out_dir) ] args = [ rebase_path(sources[0]), rebase_path(outputs[0]), @@ -698,21 +678,15 @@ optional("heif") { deps = [] - sources = [ - "src/codec/SkHeifCodec.cpp", - ] + sources = [ "src/codec/SkHeifCodec.cpp" ] } optional("jpeg") { enabled = skia_use_libjpeg_turbo public_defines = [ "SK_HAS_JPEG_LIBRARY" ] - deps = [ - "//third_party/libjpeg-turbo:libjpeg", - ] - public = [ - "include/encode/SkJpegEncoder.h", - ] + deps = [ "//third_party/libjpeg-turbo:libjpeg" ] + public = [ "include/encode/SkJpegEncoder.h" ] sources = [ "src/codec/SkJpegCodec.cpp", "src/codec/SkJpegDecoderMgr.cpp", @@ -726,9 +700,7 @@ optional("pdf") { enabled = skia_use_zlib && skia_enable_pdf public_defines = [ "SK_SUPPORT_PDF" ] - deps = [ - "//third_party/zlib", - ] + deps = [ "//third_party/zlib" ] if (skia_use_libjpeg_turbo) { deps += [ ":jpeg" ] } @@ -747,9 +719,7 @@ optional("png") { enabled = skia_use_libpng public_defines = [ "SK_HAS_PNG_LIBRARY" ] - deps = [ - "//third_party/libpng", - ] + deps = [ "//third_party/libpng" ] sources = [ "src/codec/SkIcoCodec.cpp", "src/codec/SkPngCodec.cpp", @@ -771,9 +741,7 @@ optional("raw") { # Skia. configs_to_remove = [ "//gn:no_exceptions" ] - sources = [ - "src/codec/SkRawCodec.cpp", - ] + sources = [ "src/codec/SkRawCodec.cpp" ] } import("third_party/skcms/skcms.gni") @@ -786,9 +754,7 @@ source_set("skcms") { ] } - public = [ - "include/third_party/skcms/skcms.h", - ] + public = [ "include/third_party/skcms/skcms.h" ] include_dirs = [ "include/third_party/skcms" ] sources = rebase_path(skcms_sources, ".", "third_party/skcms") } @@ -796,9 +762,7 @@ source_set("skcms") { optional("typeface_freetype") { enabled = skia_use_freetype - deps = [ - "//third_party/freetype2", - ] + deps = [ "//third_party/freetype2" ] sources = [ "src/ports/SkFontHost_FreeType.cpp", "src/ports/SkFontHost_FreeType_common.cpp", @@ -809,9 +773,7 @@ optional("webp") { enabled = skia_use_libwebp public_defines = [ "SK_HAS_WEBP_LIBRARY" ] - deps = [ - "//third_party/libwebp", - ] + deps = [ "//third_party/libwebp" ] sources = [ "src/codec/SkWebpCodec.cpp", "src/images/SkWebpEncoder.cpp", @@ -822,21 +784,15 @@ optional("wuffs") { enabled = skia_use_wuffs public_defines = [ "SK_HAS_WUFFS_LIBRARY" ] - deps = [ - "//third_party/wuffs", - ] - sources = [ - "src/codec/SkWuffsCodec.cpp", - ] + deps = [ "//third_party/wuffs" ] + sources = [ "src/codec/SkWuffsCodec.cpp" ] } optional("xml") { enabled = skia_use_expat public_defines = [ "SK_XML" ] - deps = [ - "//third_party/expat", - ] + deps = [ "//third_party/expat" ] sources = [ "src/svg/SkSVGCanvas.cpp", "src/svg/SkSVGDevice.cpp", @@ -860,17 +816,13 @@ if (skia_enable_gpu && skia_generate_workarounds) { action("workaround_list") { script = "tools/build_workaround_header.py" - inputs = [ - "src/gpu/gpu_workaround_list.txt", - ] + inputs = [ "src/gpu/gpu_workaround_list.txt" ] # see comments in skia_compile_processors about out dir path shenanigans. output_file = rebase_path("include/gpu/GrDriverBugWorkaroundsAutogen.h", root_out_dir) - outputs = [ - "$root_out_dir/$output_file", - ] + outputs = [ "$root_out_dir/$output_file" ] args = [ "--output-file", "$output_file", @@ -1091,9 +1043,7 @@ if (target_cpu == "wasm") { "tools/debugger/JsonWriteBuffer.cpp", ] - deps = [ - ":fontmgr_wasm", - ] + deps = [ ":fontmgr_wasm" ] } } @@ -1214,9 +1164,7 @@ if (skia_enable_tools) { [ rebase_path(skia_h, root_build_dir) ] + rebase_path(skia_public_includes) depfile = "$skia_h.deps" - outputs = [ - skia_h, - ] + outputs = [ skia_h ] } if (target_cpu == "x64") { @@ -1252,9 +1200,7 @@ if (skia_enable_tools) { } source_set("public_headers_warnings_check") { - sources = [ - "tools/public_headers_warnings_check.cpp", - ] + sources = [ "tools/public_headers_warnings_check.cpp" ] configs -= [ "//gn:warnings_except_public_headers" ] configs += [ ":our_vulkan_headers" ] deps = [ @@ -1298,31 +1244,21 @@ if (skia_enable_tools) { action("${app_name}_generate_info_plist") { script = "//gn/gen_plist_ios.py" - outputs = [ - "$gen_path/${app_name}_Info.plist", - ] + outputs = [ "$gen_path/${app_name}_Info.plist" ] args = [ rebase_path("$gen_path/$app_name", root_build_dir) ] } bundle_data("${app_name}_bundle_info_plist") { - public_deps = [ - ":${app_name}_generate_info_plist", - ] - sources = [ - "$gen_path/${app_name}_Info.plist", - ] - outputs = [ - "{{bundle_root_dir}}/Info.plist", - ] + public_deps = [ ":${app_name}_generate_info_plist" ] + sources = [ "$gen_path/${app_name}_Info.plist" ] + outputs = [ "{{bundle_root_dir}}/Info.plist" ] } has_skps = "True" == exec_script("//gn/checkdir.py", [ rebase_path("skps", root_build_dir) ], "trim string") bundle_data("${app_name}_bundle_resources") { - sources = [ - "resources", - ] + sources = [ "resources" ] outputs = [ # iOS reserves the folders 'Resources' and 'resources' so store one level deeper "{{bundle_resources_dir}}/data/resources", @@ -1330,9 +1266,7 @@ if (skia_enable_tools) { } if (has_skps) { bundle_data("${app_name}_bundle_skps") { - sources = [ - "skps", - ] + sources = [ "skps" ] outputs = [ # Store in same folder as resources "{{bundle_resources_dir}}/data/skps", @@ -1354,28 +1288,16 @@ if (skia_enable_tools) { } bundle_data("${app_name}_bundle_executable") { - public_deps = [ - ":${app_name}_generate_executable", - ] - sources = [ - "$gen_path/$app_name", - ] - outputs = [ - "{{bundle_executable_dir}}/$app_name", - ] + public_deps = [ ":${app_name}_generate_executable" ] + sources = [ "$gen_path/$app_name" ] + outputs = [ "{{bundle_executable_dir}}/$app_name" ] testonly = true } bundle_data("${app_name}_bundle_symbols") { - public_deps = [ - ":${app_name}_generate_executable", - ] - sources = [ - "$gen_path/${app_name}.dSYM", - ] - outputs = [ - "{{bundle_executable_dir}}/${app_name}.dSYM", - ] + public_deps = [ ":${app_name}_generate_executable" ] + sources = [ "$gen_path/${app_name}.dSYM" ] + outputs = [ "{{bundle_executable_dir}}/${app_name}.dSYM" ] testonly = true } @@ -1433,13 +1355,9 @@ if (skia_enable_tools) { if (is_android && skia_android_serial != "" && defined(_executable)) { action("push_" + target_name) { script = "gn/push_to_android.py" - deps = [ - ":" + _executable, - ] + deps = [ ":" + _executable ] _stamp = "$target_gen_dir/$_executable.pushed_$skia_android_serial" - outputs = [ - _stamp, - ] + outputs = [ _stamp ] args = [ rebase_path("$root_build_dir/$_executable"), skia_android_serial, @@ -1555,54 +1473,30 @@ if (skia_enable_tools) { } test_lib("flags") { - sources = [ - "tools/flags/CommandLineFlags.cpp", - ] + sources = [ "tools/flags/CommandLineFlags.cpp" ] } test_lib("common_flags_config") { - sources = [ - "tools/flags/CommonFlagsConfig.cpp", - ] - deps = [ - ":flags", - ] - public_deps = [ - ":gpu_tool_utils", - ] + sources = [ "tools/flags/CommonFlagsConfig.cpp" ] + deps = [ ":flags" ] + public_deps = [ ":gpu_tool_utils" ] } test_lib("common_flags_gpu") { - sources = [ - "tools/flags/CommonFlagsGpu.cpp", - ] - deps = [ - ":flags", - ] - public_deps = [ - ":gpu_tool_utils", - ] + sources = [ "tools/flags/CommonFlagsGpu.cpp" ] + deps = [ ":flags" ] + public_deps = [ ":gpu_tool_utils" ] } test_lib("common_flags_images") { - sources = [ - "tools/flags/CommonFlagsImages.cpp", - ] - deps = [ - ":flags", - ] + sources = [ "tools/flags/CommonFlagsImages.cpp" ] + deps = [ ":flags" ] } test_lib("common_flags_aa") { - sources = [ - "tools/flags/CommonFlagsAA.cpp", - ] - deps = [ - ":flags", - ] + sources = [ "tools/flags/CommonFlagsAA.cpp" ] + deps = [ ":flags" ] } test_lib("trace") { - deps = [ - ":flags", - ] + deps = [ ":flags" ] sources = [ "tools/trace/ChromeTracingTracer.cpp", "tools/trace/ChromeTracingTracer.h", @@ -1669,15 +1563,11 @@ if (skia_enable_tools) { ":experimental_svg_model", ":flags", ] - public_deps = [ - ":gpu_tool_utils", - ] + public_deps = [ ":gpu_tool_utils" ] } test_lib("etc1") { - sources = [ - "third_party/etc1/etc1.cpp", - ] + sources = [ "third_party/etc1/etc1.cpp" ] } if (skia_use_ffmpeg) { @@ -1714,9 +1604,7 @@ if (skia_enable_tools) { sources += [ "gm/fiddle.cpp" ] deps += [ ":skia.h" ] } - public_deps = [ - ":gpu_tool_utils", - ] + public_deps = [ ":gpu_tool_utils" ] if (skia_use_ffmpeg) { deps += [ ":video_decoder" ] @@ -1817,9 +1705,7 @@ if (skia_enable_tools) { "experimental/xform/SkXform.cpp", "experimental/xform/XContext.cpp", ] - deps = [ - ":skia", - ] + deps = [ ":skia" ] } if (skia_use_lua) { @@ -1835,9 +1721,7 @@ if (skia_enable_tools) { } test_app("lua_app") { - sources = [ - "tools/lua/lua_app.cpp", - ] + sources = [ "tools/lua/lua_app.cpp" ] deps = [ ":lua", ":skia", @@ -1846,9 +1730,7 @@ if (skia_enable_tools) { } test_app("lua_pictures") { - sources = [ - "tools/lua/lua_pictures.cpp", - ] + sources = [ "tools/lua/lua_pictures.cpp" ] deps = [ ":flags", ":lua", @@ -1861,28 +1743,20 @@ if (skia_enable_tools) { if (is_linux || is_mac) { test_app("skottie_tool") { - deps = [ - "modules/skottie:tool", - ] + deps = [ "modules/skottie:tool" ] } } test_app("make_skqp_model") { - sources = [ - "tools/skqp/make_skqp_model.cpp", - ] - deps = [ - ":skia", - ] + sources = [ "tools/skqp/make_skqp_model.cpp" ] + deps = [ ":skia" ] } if (target_cpu != "wasm") { import("gn/samples.gni") test_lib("samples") { sources = samples_sources - public_deps = [ - ":tool_utils", - ] + public_deps = [ ":tool_utils" ] deps = [ ":experimental_svg_model", ":flags", @@ -1902,9 +1776,7 @@ if (skia_enable_tools) { } } test_app("imgcvt") { - sources = [ - "tools/imgcvt.cpp", - ] + sources = [ "tools/imgcvt.cpp" ] deps = [ ":skcms", ":skia", @@ -1922,9 +1794,7 @@ if (skia_enable_tools) { ] } test_app("fm") { - sources = [ - "tools/fm/fm.cpp", - ] + sources = [ "tools/fm/fm.cpp" ] deps = [ ":common_flags_aa", ":common_flags_gpu", @@ -1970,19 +1840,13 @@ if (skia_enable_tools) { if (!is_win) { test_app("remote_demo") { - sources = [ - "tools/remote_demo.cpp", - ] - deps = [ - ":skia", - ] + sources = [ "tools/remote_demo.cpp" ] + deps = [ ":skia" ] } } test_app("nanobench") { - sources = [ - "bench/nanobench.cpp", - ] + sources = [ "bench/nanobench.cpp" ] deps = [ ":bench", ":common_flags_aa", @@ -2003,9 +1867,7 @@ if (skia_enable_tools) { } test_app("skpinfo") { - sources = [ - "tools/skpinfo.cpp", - ] + sources = [ "tools/skpinfo.cpp" ] deps = [ ":flags", ":skia", @@ -2014,9 +1876,7 @@ if (skia_enable_tools) { if (skia_use_ffmpeg) { test_app("skottie2movie") { - sources = [ - "tools/skottie2movie.cpp", - ] + sources = [ "tools/skottie2movie.cpp" ] deps = [ ":flags", ":skia", @@ -2028,9 +1888,7 @@ if (skia_enable_tools) { } test_app("skpbench") { - sources = [ - "tools/skpbench/skpbench.cpp", - ] + sources = [ "tools/skpbench/skpbench.cpp" ] deps = [ ":common_flags_config", ":common_flags_gpu", @@ -2042,9 +1900,7 @@ if (skia_enable_tools) { } test_app("sktexttopdf") { - sources = [ - "tools/using_skia_and_harfbuzz.cpp", - ] + sources = [ "tools/using_skia_and_harfbuzz.cpp" ] deps = [ ":skia", "modules/skshaper", @@ -2052,12 +1908,8 @@ if (skia_enable_tools) { } test_app("create_test_font") { - sources = [ - "tools/fonts/create_test_font.cpp", - ] - deps = [ - ":skia", - ] + sources = [ "tools/fonts/create_test_font.cpp" ] + deps = [ ":skia" ] assert_no_deps = [ # tool_utils requires the output of this app. ":tool_utils", @@ -2066,9 +1918,7 @@ if (skia_enable_tools) { if (skia_use_expat) { test_app("create_test_font_color") { - sources = [ - "tools/fonts/create_test_font_color.cpp", - ] + sources = [ "tools/fonts/create_test_font_color.cpp" ] deps = [ ":flags", ":skia", @@ -2078,9 +1928,7 @@ if (skia_enable_tools) { } test_app("get_images_from_skps") { - sources = [ - "tools/get_images_from_skps.cpp", - ] + sources = [ "tools/get_images_from_skps.cpp" ] deps = [ ":flags", ":skia", @@ -2198,9 +2046,7 @@ if (skia_enable_tools) { } test_app("skp_parser") { - sources = [ - "tools/skp_parser.cpp", - ] + sources = [ "tools/skp_parser.cpp" ] deps = [ ":skia", ":tool_utils", @@ -2225,9 +2071,7 @@ if (skia_enable_tools) { ] } test_app("skqp") { - sources = [ - "tools/skqp/src/skqp_main.cpp", - ] + sources = [ "tools/skqp/src/skqp_main.cpp" ] deps = [ ":skia", ":skqp_lib", @@ -2235,9 +2079,7 @@ if (skia_enable_tools) { ] } test_app("jitter_gms") { - sources = [ - "tools/skqp/jitter_gms.cpp", - ] + sources = [ "tools/skqp/jitter_gms.cpp" ] deps = [ ":gm", ":skia", @@ -2248,9 +2090,7 @@ if (skia_enable_tools) { if (is_android) { test_app("skqp_app") { is_shared_library = true - sources = [ - "tools/skqp/src/jni_skqp.cpp", - ] + sources = [ "tools/skqp/src/jni_skqp.cpp" ] deps = [ ":skia", ":skqp_lib", @@ -2278,9 +2118,7 @@ if (skia_enable_tools) { } test_app("list_gms") { - sources = [ - "tools/list_gms.cpp", - ] + sources = [ "tools/list_gms.cpp" ] deps = [ ":gm", ":skia", @@ -2405,9 +2243,7 @@ if (skia_enable_tools) { libs += [ "MetalKit.framework" ] } - deps = [ - ":tool_utils", - ] + deps = [ ":tool_utils" ] if (is_android) { deps += [ "//third_party/native_app_glue" ] } else if (is_ios) { @@ -2483,9 +2319,7 @@ if (skia_enable_tools) { if (!skia_use_angle && (is_linux || is_win || is_mac)) { test_app("HelloWorld") { - sources = [ - "example/HelloWorld.cpp", - ] + sources = [ "example/HelloWorld.cpp" ] libs = [] deps = [ @@ -2500,9 +2334,7 @@ if (skia_enable_tools) { if (is_linux || is_mac || is_ios) { test_app("SkiaSDLExample") { - sources = [ - "example/SkiaSDLExample.cpp", - ] + sources = [ "example/SkiaSDLExample.cpp" ] libs = [] deps = [ ":gpu_tool_utils", @@ -2515,12 +2347,8 @@ if (skia_enable_tools) { if (skia_qt_path != "" && (is_win || is_linux || is_mac)) { action_foreach("generate_mocs") { script = "gn/call.py" - sources = [ - "tools/mdbviz/MainWindow.h", - ] - outputs = [ - "$target_gen_dir/mdbviz/{{source_name_part}}_moc.cpp", - ] + sources = [ "tools/mdbviz/MainWindow.h" ] + outputs = [ "$target_gen_dir/mdbviz/{{source_name_part}}_moc.cpp" ] args = [ "$skia_qt_path" + "/bin/moc", "{{source}}", @@ -2530,12 +2358,8 @@ if (skia_enable_tools) { } action_foreach("generate_resources") { script = "gn/call.py" - sources = [ - "tools/mdbviz/resources.qrc", - ] - outputs = [ - "$target_gen_dir/mdbviz/{{source_name_part}}_res.cpp", - ] + sources = [ "tools/mdbviz/resources.qrc" ] + outputs = [ "$target_gen_dir/mdbviz/{{source_name_part}}_res.cpp" ] args = [ "$skia_qt_path" + "/bin/rcc", "{{source}}", @@ -2582,30 +2406,20 @@ if (skia_enable_tools) { if (is_android && defined(ndk) && ndk != "") { copy("gdbserver") { - sources = [ - "$ndk/$ndk_gdbserver", - ] - outputs = [ - "$root_out_dir/gdbserver", - ] + sources = [ "$ndk/$ndk_gdbserver" ] + outputs = [ "$root_out_dir/gdbserver" ] } } if (skia_use_opencl) { test_app("hello-opencl") { - sources = [ - "tools/hello-opencl.cpp", - ] - deps = [ - "//third_party/opencl", - ] + sources = [ "tools/hello-opencl.cpp" ] + deps = [ "//third_party/opencl" ] } } executable("cpu_modules") { - sources = [ - "tools/cpu_modules.cpp", - ] + sources = [ "tools/cpu_modules.cpp" ] deps = [ ":skia", "modules/particles", @@ -2615,9 +2429,7 @@ if (skia_enable_tools) { if (skia_use_icu && skia_use_harfbuzz) { test_app("editor") { is_shared_library = is_android - deps = [ - "experimental/editor:editor_app", - ] + deps = [ "experimental/editor:editor_app" ] } } diff --git a/skia/experimental/editor/BUILD.gn b/skia/experimental/editor/BUILD.gn index aeac20ef762a74e040ca0f980c4cd0e3bf4778c5..cab388f53c0fca6d076bd7cf80dbc97f8fde2d1a 100644 --- a/skia/experimental/editor/BUILD.gn +++ b/skia/experimental/editor/BUILD.gn @@ -16,25 +16,15 @@ if (skia_use_icu && skia_use_harfbuzz) { "editor.cpp", "stringslice.cpp", ] - public_deps = [ - "../..:skia", - ] - deps = [ - ":shape", - ] + public_deps = [ "../..:skia" ] + deps = [ ":shape" ] } source_set("shape") { include_dirs = [ "../.." ] - public = [ - "shape.h", - ] - sources = [ - "shape.cpp", - ] - public_deps = [ - "../..:skia", - ] + public = [ "shape.h" ] + sources = [ "shape.cpp" ] + public_deps = [ "../..:skia" ] deps = [ ":word_boundaries", "../../modules/skshaper", @@ -43,27 +33,15 @@ if (skia_use_icu && skia_use_harfbuzz) { source_set("word_boundaries") { include_dirs = [ "../.." ] - public = [ - "word_boundaries.h", - ] - sources = [ - "word_boundaries.cpp", - ] - deps = [ - "../../third_party/icu", - ] + public = [ "word_boundaries.h" ] + sources = [ "word_boundaries.cpp" ] + deps = [ "../../third_party/icu" ] } source_set("editor_app") { testonly = true - sources = [ - "editor_application.cpp", - ] - public_deps = [ - "../..:sk_app", - ] - deps = [ - ":editor_lib", - ] + sources = [ "editor_application.cpp" ] + public_deps = [ "../..:sk_app" ] + deps = [ ":editor_lib" ] } } diff --git a/skia/gn/BUILD.gn b/skia/gn/BUILD.gn index 8947d99c1147739d0934c70375f0c0f718b721bc..312a97a161c451e96c5409a0d985f55dfc4561b0 100644 --- a/skia/gn/BUILD.gn +++ b/skia/gn/BUILD.gn @@ -262,15 +262,19 @@ config("warnings") { # Disable a bunch of warnings: "/wd4244", # conversion from 'float' to 'int', possible loss of data "/wd4267", # conversion from 'size_t' to 'int', possible loss of data - "/wd4800", # forcing value to bool 'true' or 'false' (performance warning) + "/wd4800", # forcing value to bool 'true' or 'false' (performance + # warning) # Probably only triggers when /EHsc is enabled. "/wd4291", # no matching operator delete found; - # memory will not be freed if initialization throws an exception + # memory will not be freed if initialization throws an + # exception # These only show up in shared builds: - "/wd4251", # class 'type' needs to have dll-interface to be used by clients of class 'type2' - "/wd4275", # non dll-interface class 'base' used as base for dll-interface class 'derived' + "/wd4251", # class 'type' needs to have dll-interface to be used by + # clients of class 'type2' + "/wd4275", # non dll-interface class 'base' used as base for + # dll-interface class 'derived' ] } else { cflags += [ @@ -294,7 +298,8 @@ config("warnings") { cflags += [ "-fcolor-diagnostics", "-Weverything", - "-Wno-unknown-warning-option", # Let older Clangs ignore newer Clangs' warnings. + "-Wno-unknown-warning-option", # Let older Clangs ignore newer Clangs' + # warnings. ] if (target_cpu == "arm" && is_ios) { @@ -485,7 +490,8 @@ config("executable") { } else if (is_win) { ldflags = [ "/SUBSYSTEM:CONSOLE", # Quiet "no subsystem specified; CONSOLE assumed". - "/INCREMENTAL:NO", # Quiet warnings about failing to incrementally link by never trying to. + "/INCREMENTAL:NO", # Quiet warnings about failing to incrementally link + # by never trying to. ] } } diff --git a/skia/gn/toolchain/BUILD.gn b/skia/gn/toolchain/BUILD.gn index 6fc23b946a65723ebad75ad48dbff6a42601ff2d..81f2b0f39d411631a9033f4e0bf4e9d872383f47 100644 --- a/skia/gn/toolchain/BUILD.gn +++ b/skia/gn/toolchain/BUILD.gn @@ -75,9 +75,8 @@ toolchain("msvc") { _ml += "64" } command = "$env_setup \"$bin/$_ml.exe\" {{asmflags}} /nologo /c /Fo {{output}} {{source}}" - outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj", - ] + outputs = + [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj" ] description = "assemble {{source}}" } @@ -88,9 +87,8 @@ toolchain("msvc") { # Label names may have spaces so pdbname must be quoted. command = "$env_setup $cc_wrapper $cl /nologo /showIncludes /FC {{defines}} {{include_dirs}} {{cflags}} $cl_m32_flag {{cflags_c}} /c {{source}} /Fo{{output}} /Fd\"$pdbname\"" depsformat = "msvc" - outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj", - ] + outputs = + [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj" ] description = "compile {{source}}" } @@ -101,9 +99,8 @@ toolchain("msvc") { # Label names may have spaces so pdbname must be quoted. command = "$env_setup $cc_wrapper $cl /nologo /showIncludes /FC {{defines}} {{include_dirs}} {{cflags}} $cl_m32_flag {{cflags_cc}} /c {{source}} /Fo{{output}} /Fd\"$pdbname\"" depsformat = "msvc" - outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj", - ] + outputs = + [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj" ] description = "compile {{source}}" } @@ -162,9 +159,7 @@ toolchain("msvc") { command = "$env_setup $link /nologo /OUT:$exename /PDB:$pdbname @$rspfile" default_output_extension = ".exe" default_output_dir = "{{root_out_dir}}" - outputs = [ - exename, - ] + outputs = [ exename ] # inputs_newline works around a fixed per-line buffer size in the linker. rspfile_content = "{{inputs_newline}} {{libs}} {{solibs}} {{ldflags}}" @@ -195,9 +190,8 @@ template("gcc_like_toolchain") { depfile = "{{output}}.d" command = "$cc_wrapper $cc -MD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} -c {{source}} -o {{output}}" depsformat = "gcc" - outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o", - ] + outputs = + [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ] description = "compile {{source}}" } @@ -205,9 +199,8 @@ template("gcc_like_toolchain") { depfile = "{{output}}.d" command = "$cc_wrapper $cxx -MD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} -c {{source}} -o {{output}}" depsformat = "gcc" - outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o", - ] + outputs = + [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ] description = "compile {{source}}" } @@ -215,9 +208,8 @@ template("gcc_like_toolchain") { depfile = "{{output}}.d" command = "$cc_wrapper $cc -MD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_objc}} -c {{source}} -o {{output}}" depsformat = "gcc" - outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o", - ] + outputs = + [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ] description = "compile {{source}}" } @@ -225,9 +217,8 @@ template("gcc_like_toolchain") { depfile = "{{output}}.d" command = "$cc_wrapper $cxx -MD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} {{cflags_objcc}} -c {{source}} -o {{output}}" depsformat = "gcc" - outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o", - ] + outputs = + [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ] description = "compile {{source}}" } @@ -235,9 +226,8 @@ template("gcc_like_toolchain") { depfile = "{{output}}.d" command = "$cc_wrapper $cc -MD -MF $depfile {{defines}} {{include_dirs}} {{asmflags}} -c {{source}} -o {{output}}" depsformat = "gcc" - outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o", - ] + outputs = + [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o" ] description = "assemble {{source}}" } @@ -246,9 +236,8 @@ template("gcc_like_toolchain") { rspfile_content = "{{inputs}}" ar_py = rebase_path("../ar.py") command = "python $ar_py $ar {{output}} $rspfile" - outputs = [ - "{{root_out_dir}}/{{target_output_name}}{{output_extension}}", - ] + outputs = + [ "{{root_out_dir}}/{{target_output_name}}{{output_extension}}" ] default_output_extension = ".a" output_prefix = "lib" description = "link {{output}}" @@ -279,9 +268,7 @@ template("gcc_like_toolchain") { } command = "$cxx -shared {{ldflags}} $_start_group @$rspfile {{solibs}} $_end_group {{libs}} $rpath -o {{output}}" - outputs = [ - "{{root_out_dir}}/$soname", - ] + outputs = [ "{{root_out_dir}}/$soname" ] output_prefix = "lib" default_output_extension = ".so" description = "link {{output}}" @@ -310,9 +297,7 @@ template("gcc_like_toolchain") { command = "$cxx {{ldflags}} $_start_group @$rspfile {{solibs}} $_end_group {{libs}} -o $exe_name" } - outputs = [ - "$exe_name", - ] + outputs = [ "$exe_name" ] if (is_ios) { outputs += [ "{{root_out_dir}}/{{target_output_name}}.dSYM" ] } diff --git a/skia/modules/particles/BUILD.gn b/skia/modules/particles/BUILD.gn index 1573b72ee9f07aec7a4bc9067cda6e34d0200c4c..7ee0e47a5920d2f8686577073106244eedd8325a 100644 --- a/skia/modules/particles/BUILD.gn +++ b/skia/modules/particles/BUILD.gn @@ -20,9 +20,7 @@ static_library("particles") { import("particles.gni") public_configs = [ ":public_config" ] include_dirs = [ "../../tools/timer" ] - deps = [ - "../..:skia", - ] + deps = [ "../..:skia" ] sources = skia_particle_sources configs += [ "../../:skia_private" ] if (skia_enable_tools) { diff --git a/skia/modules/skottie/BUILD.gn b/skia/modules/skottie/BUILD.gn index c9703cbfc0ec106bcbda151501ea7d138c8776a4..c4783e6cb007d5ea40783eae558fa5004a5a7b3a 100644 --- a/skia/modules/skottie/BUILD.gn +++ b/skia/modules/skottie/BUILD.gn @@ -40,9 +40,7 @@ if (skia_enable_skottie) { public_configs = [ ":utils_config" ] configs += [ "../../:skia_private" ] - sources = [ - "utils/SkottieUtils.cpp", - ] + sources = [ "utils/SkottieUtils.cpp" ] deps = [ ":skottie", "../..:skia", @@ -57,9 +55,7 @@ if (skia_enable_skottie) { "../..:skia_private", "../..:tests_config", ] - sources = [ - "src/SkottieTest.cpp", - ] + sources = [ "src/SkottieTest.cpp" ] deps = [ ":skottie", @@ -92,9 +88,7 @@ if (skia_enable_skottie) { "../..:skia", ] - public_deps = [ - ":skottie", - ] + public_deps = [ ":skottie" ] } source_set("tool") { @@ -102,9 +96,7 @@ if (skia_enable_skottie) { testonly = true configs += [ "../..:skia_private" ] - sources = [ - "src/SkottieTool.cpp", - ] + sources = [ "src/SkottieTool.cpp" ] deps = [ "../..:flags", diff --git a/skia/modules/skparagraph/BUILD.gn b/skia/modules/skparagraph/BUILD.gn index 5a85d37c4ededf5ad799dacc1fe4dc340ccf2c02..708ad4bc65accf39258acd63accd9fa02163937f 100644 --- a/skia/modules/skparagraph/BUILD.gn +++ b/skia/modules/skparagraph/BUILD.gn @@ -56,9 +56,7 @@ if (skia_enable_skparagraph) { source_set("tests") { if (skia_use_icu && skia_use_harfbuzz && paragraph_tests_enabled) { testonly = true - sources = [ - "//tests/SkParagraphTest.cpp", - ] + sources = [ "//tests/SkParagraphTest.cpp" ] deps = [ ":skparagraph", "../..:gpu_tool_utils", @@ -72,9 +70,7 @@ if (skia_enable_skparagraph) { source_set("bench") { if (skia_use_icu && skia_use_harfbuzz && paragraph_bench_enabled) { testonly = true - sources = [ - "//bench/ParagraphBench.cpp", - ] + sources = [ "//bench/ParagraphBench.cpp" ] deps = [ ":skparagraph", "../..:skia", @@ -87,9 +83,7 @@ if (skia_enable_skparagraph) { source_set("samples") { if (skia_use_icu && skia_use_harfbuzz) { testonly = true - sources = [ - "//samplecode/SampleParagraph.cpp", - ] + sources = [ "//samplecode/SampleParagraph.cpp" ] deps = [ ":skparagraph", ":utils", diff --git a/skia/modules/sksg/BUILD.gn b/skia/modules/sksg/BUILD.gn index 93845f6c96adcd46737042dc34b3832a94871730..3bf998b1739923d44b2af4f82ebb8252ec44ab5e 100644 --- a/skia/modules/sksg/BUILD.gn +++ b/skia/modules/sksg/BUILD.gn @@ -15,9 +15,7 @@ component("sksg") { public_configs = [ ":public_config" ] sources = skia_sksg_sources configs += [ "../../:skia_private" ] - deps = [ - "../..:skia", - ] + deps = [ "../..:skia" ] } if (defined(is_skia_standalone) && skia_enable_tools) { @@ -28,9 +26,7 @@ if (defined(is_skia_standalone) && skia_enable_tools) { "../..:skia_private", "../..:tests_config", # TODO: refactor to make this nicer ] - sources = [ - "tests/SGTest.cpp", - ] + sources = [ "tests/SGTest.cpp" ] deps = [ ":sksg", "../..:gpu_tool_utils", # TODO: refactor to make this nicer @@ -46,9 +42,7 @@ if (defined(is_skia_standalone) && skia_enable_tools) { "../..:skia_private", "../..:samples_config", # TODO: refactor to make this nicer ] - sources = [ - "samples/SampleSVGPong.cpp", - ] + sources = [ "samples/SampleSVGPong.cpp" ] deps = [ ":sksg", "../..:samples", diff --git a/skia/modules/skshaper/BUILD.gn b/skia/modules/skshaper/BUILD.gn index a672d984fb5aabca976b9cb8f7c81576692b36d6..f5074fa61513bc4340e9313f0846ebd44ce0f773 100644 --- a/skia/modules/skshaper/BUILD.gn +++ b/skia/modules/skshaper/BUILD.gn @@ -23,9 +23,7 @@ if (skia_enable_skshaper) { import("skshaper.gni") public_configs = [ ":public_config" ] public = skia_shaper_public - deps = [ - "../..:skia", - ] + deps = [ "../..:skia" ] sources = skia_shaper_primitive_sources if (skia_use_icu && skia_use_harfbuzz) { sources += skia_shaper_harfbuzz_sources diff --git a/skia/third_party/angle2/BUILD.gn b/skia/third_party/angle2/BUILD.gn index 9b6ab3b1d9257763cf2332e8e5e63c1d7a25055e..9aff0c766f04e81af1e06834162ff56742f8ed4d 100644 --- a/skia/third_party/angle2/BUILD.gn +++ b/skia/third_party/angle2/BUILD.gn @@ -8,9 +8,9 @@ declare_args() { angle_root = "../externals/angle2" -import("../third_party.gni") import("$angle_root/src/compiler.gni") import("$angle_root/src/libGLESv2.gni") +import("../third_party.gni") third_party("angle2") { public_include_dirs = [ "$angle_root/include" ] @@ -71,12 +71,8 @@ config("common") { } copy("commit_id") { - sources = [ - "$angle_root/src/commit.h", - ] - outputs = [ - "$root_gen_dir/angle2/id/commit.h", - ] + sources = [ "$angle_root/src/commit.h" ] + outputs = [ "$root_gen_dir/angle2/id/commit.h" ] } shared_library("libGLESv2") { @@ -86,9 +82,7 @@ shared_library("libGLESv2") { "LIBANGLE_IMPLEMENTATION", "LIBGLESV2_IMPLEMENTATION", ] - deps = [ - ":commit_id", - ] + deps = [ ":commit_id" ] libs = [] sources = rebase_path( @@ -137,9 +131,7 @@ shared_library("libEGL") { configs += [ ":common" ] configs -= [ "//gn:warnings" ] defines = [ "LIBEGL_IMPLEMENTATION" ] - deps = [ - ":libGLESv2", - ] + deps = [ ":libGLESv2" ] sources = rebase_path(libegl_sources, ".", angle_root) if (is_win) { sources += [ "$angle_root/src/libEGL/libEGL.def" ] diff --git a/skia/third_party/cpu-features/BUILD.gn b/skia/third_party/cpu-features/BUILD.gn index d1f6fad089b5bcbbaf2219972133a6f221e441cc..9bded0a83396682eb5f3de10fe53f1cfc0ccf0ec 100644 --- a/skia/third_party/cpu-features/BUILD.gn +++ b/skia/third_party/cpu-features/BUILD.gn @@ -11,7 +11,5 @@ import("../third_party.gni") third_party("cpu-features") { public_include_dirs = [ "$ndk/sources/android/cpufeatures" ] - sources = [ - "$ndk/sources/android/cpufeatures/cpu-features.c", - ] + sources = [ "$ndk/sources/android/cpufeatures/cpu-features.c" ] } diff --git a/skia/third_party/dawn/BUILD.gn b/skia/third_party/dawn/BUILD.gn index 4247f505d9c7830d082e8178fa0db3db34a9e58b..7f93ad2f06b665837c535ae604030ca4c11c8938 100644 --- a/skia/third_party/dawn/BUILD.gn +++ b/skia/third_party/dawn/BUILD.gn @@ -13,8 +13,8 @@ # limitations under the License. dawn_root = "../externals/dawn" -import("$dawn_root/scripts/dawn_features.gni") import("$dawn_root/generator/dawn_generator.gni") +import("$dawn_root/scripts/dawn_features.gni") ############################################################################### # Template to wrap the Dawn code generator @@ -108,9 +108,7 @@ static_library("dawn_common") { "$dawn_root") configs += [ ":dawn_internal" ] - deps = [ - ":dawn_headers", - ] + deps = [ ":dawn_headers" ] } ############################################################################### @@ -127,9 +125,7 @@ dawn_json_generator("dawn_headers_gen") { source_set("dawn_headers") { public_configs = [ ":libdawn_public" ] - deps = [ - ":dawn_headers_gen", - ] + deps = [ ":dawn_headers_gen" ] sources = get_target_outputs(":dawn_headers_gen") sources += [ @@ -148,14 +144,10 @@ dawn_json_generator("libdawn_gen") { } static_library("libdawn") { - public_deps = [ - ":dawn_headers", - ] + public_deps = [ ":dawn_headers" ] defines = [ "DAWN_IMPLEMENTATION" ] - deps = [ - ":libdawn_gen", - ] + deps = [ ":libdawn_gen" ] sources = get_target_outputs(":libdawn_gen") } @@ -202,9 +194,7 @@ if (dawn_enable_opengl) { # Public libdawn_native headers so they can be publically visible for # dependencies of libdawn_native source_set("libdawn_native_headers") { - public_deps = [ - ":dawn_headers", - ] + public_deps = [ ":dawn_headers" ] sources = rebase_path( [ "src/include/dawn_native/DawnNative.h", @@ -236,9 +226,7 @@ source_set("libdawn_native_sources") { public_configs = [ ":libdawn_native_internal" ] # Set the headers as a public dependency so they are visible to unittests - public_deps = [ - ":libdawn_native_headers", - ] + public_deps = [ ":libdawn_native_headers" ] libs = [] @@ -551,14 +539,10 @@ source_set("libdawn_native_sources") { # The shared library for libdawn_native for use by samples, tests, etc. shared_library("libdawn_native") { - deps = [ - ":libdawn_native_sources", - ] + deps = [ ":libdawn_native_sources" ] #Make headers publically visible - public_deps = [ - ":libdawn_native_headers", - ] + public_deps = [ ":libdawn_native_headers" ] public_configs = [ ":libdawn_public" ] # Tell dependents where to find this shared library diff --git a/skia/third_party/dawn/third_party/BUILD.gn b/skia/third_party/dawn/third_party/BUILD.gn index 0ce069276911ef45dcede04048d6e27b9587c99f..92c0ab15027186482c600e9fe4d5c20cdfb0afd2 100644 --- a/skia/third_party/dawn/third_party/BUILD.gn +++ b/skia/third_party/dawn/third_party/BUILD.gn @@ -61,9 +61,7 @@ source_set("vulkan_headers") { } source_set("khronos_platform") { - sources = [ - "khronos/KHR/khrplatform.h", - ] + sources = [ "khronos/KHR/khrplatform.h" ] public_configs = [ ":khronos_headers_public" ] } @@ -90,9 +88,7 @@ template("spvtools_core_tables") { operand_kinds_file = "${target_gen_dir}/operand.kinds-$version.inc" extinst_file = "${spirv_tools}/source/extinst.debuginfo.grammar.json" - sources = [ - core_json_file, - ] + sources = [ core_json_file ] outputs = [ core_insts_file, operand_kinds_file, @@ -134,9 +130,7 @@ template("spvtools_core_enums") { "--enum-string-mapping-output", rebase_path(extension_map_file, root_build_dir), ] - inputs = [ - core_json_file, - ] + inputs = [ core_json_file ] outputs = [ extension_enum_file, extension_map_file, @@ -172,9 +166,7 @@ template("spvtools_glsl_tables") { core_json_file, glsl_json_file, ] - outputs = [ - glsl_insts_file, - ] + outputs = [ glsl_insts_file ] } } @@ -206,9 +198,7 @@ template("spvtools_opencl_tables") { core_json_file, opengl_json_file, ] - outputs = [ - opencl_insts_file, - ] + outputs = [ opencl_insts_file ] } } @@ -230,12 +220,8 @@ template("spvtools_language_header") { "--extinst-output-base", rebase_path(extinst_output_base, root_build_dir), ] - inputs = [ - debug_insts_file, - ] - outputs = [ - "${extinst_output_base}.h", - ] + inputs = [ debug_insts_file ] + outputs = [ "${extinst_output_base}.h" ] } } @@ -256,12 +242,8 @@ template("spvtools_vendor_table") { "--vendor-insts-output", rebase_path(extinst_file, root_build_dir), ] - inputs = [ - extinst_vendor_grammar, - ] - outputs = [ - extinst_file, - ] + inputs = [ extinst_vendor_grammar ] + outputs = [ extinst_file ] } } @@ -272,12 +254,8 @@ action("spvtools_generators_inc") { xml_file = "${spirv_headers}/include/spirv/spir-v.xml" inc_file = "${target_gen_dir}/generators.inc" - sources = [ - xml_file, - ] - outputs = [ - inc_file, - ] + sources = [ xml_file ] + outputs = [ inc_file ] args = [ "--xml", rebase_path(xml_file, root_build_dir), @@ -292,9 +270,7 @@ action("spvtools_build_version") { src_dir = "${spirv_tools}" inc_file = "${target_gen_dir}/build-version.inc" - outputs = [ - inc_file, - ] + outputs = [ inc_file ] args = [ rebase_path(src_dir, root_build_dir), rebase_path(inc_file, root_build_dir), @@ -437,9 +413,7 @@ static_library("spvtools") { ".", "$dawn_thirdparty_root/SPIRV-Tools") - public_deps = [ - ":spvtools_headers", - ] + public_deps = [ ":spvtools_headers" ] configs += [ ":spvtools_internal_config" ] } @@ -491,12 +465,8 @@ static_library("spvtools_val") { ".", "${spirv_tools}") - deps = [ - ":spvtools", - ] - public_deps = [ - ":spvtools_headers", - ] + deps = [ ":spvtools" ] + public_deps = [ ":spvtools_headers" ] configs += [ ":spvtools_internal_config" ] } @@ -677,12 +647,8 @@ static_library("spvtools_opt") { ".", "${spirv_tools}") - deps = [ - ":spvtools", - ] - public_deps = [ - ":spvtools_headers", - ] + deps = [ ":spvtools" ] + public_deps = [ ":spvtools_headers" ] configs += [ ":spvtools_internal_config" ] } diff --git a/skia/third_party/externals/angle2/BUILD.gn b/skia/third_party/externals/angle2/BUILD.gn index 464ab6514e8d7c36abca6a9138e1d0e2a7833a66..ff3f386bea48f32418d91d5560164cb48c65facf 100644 --- a/skia/third_party/externals/angle2/BUILD.gn +++ b/skia/third_party/externals/angle2/BUILD.gn @@ -167,17 +167,13 @@ if (is_win && target_cpu != "arm64") { exec_script("scripts/file_exists.py", [ _old_compiler ], "value") copy("copy_compiler_dll") { - sources = [ - "$windows_sdk_path/Redist/D3D/$target_cpu/d3dcompiler_47.dll", - ] + sources = [ "$windows_sdk_path/Redist/D3D/$target_cpu/d3dcompiler_47.dll" ] if (_has_old_compiler) { sources += [ _old_compiler ] } - outputs = [ - "$root_out_dir/{{source_file_part}}", - ] + outputs = [ "$root_out_dir/{{source_file_part}}" ] } } @@ -194,9 +190,7 @@ angle_source_set("includes") { angle_static_library("preprocessor") { sources = angle_preprocessor_sources - public_deps = [ - ":angle_common", - ] + public_deps = [ ":angle_common" ] } config("angle_disable_pool_alloc") { @@ -251,12 +245,8 @@ angle_source_set("xxhash") { } fuzzer_test("xxhash_fuzzer") { - sources = [ - "src/common/third_party/xxhash/xxhash_fuzzer.cpp", - ] - deps = [ - ":xxhash", - ] + sources = [ "src/common/third_party/xxhash/xxhash_fuzzer.cpp" ] + deps = [ ":xxhash" ] } angle_static_library("angle_common") { @@ -267,9 +257,7 @@ angle_static_library("angle_common") { ":debug_annotations_config", ] - deps = [ - ":xxhash", - ] + deps = [ ":xxhash" ] public_deps = [ ":angle_system_utils", @@ -293,9 +281,7 @@ config("angle_image_util_config") { angle_static_library("angle_image_util") { sources = libangle_image_util_sources public_configs += [ ":angle_image_util_config" ] - public_deps = [ - ":angle_common", - ] + public_deps = [ ":angle_common" ] } config("angle_gl_visibility_config") { @@ -324,9 +310,7 @@ angle_static_library("angle_gpu_info_util") { ":angle_gpu_info_util_config", ":angle_backend_config", ] - public_deps = [ - ":angle_common", - ] + public_deps = [ ":angle_common" ] sources = libangle_gpu_info_util_sources deps = [] libs = [] @@ -404,9 +388,7 @@ angle_static_library("translator") { ":preprocessor", ] - public_deps = [ - ":angle_common", - ] + public_deps = [ ":angle_common" ] if (is_win) { # Necessary to suppress some system header xtree warnigns in Release. @@ -416,18 +398,14 @@ angle_static_library("translator") { } angle_source_set("translator_fuzzer") { - sources = [ - "src/compiler/fuzz/translator_fuzzer.cpp", - ] + sources = [ "src/compiler/fuzz/translator_fuzzer.cpp" ] include_dirs = [ "include", "src", ] - deps = [ - ":translator", - ] + deps = [ ":translator" ] } config("commit_id_config") { @@ -439,14 +417,10 @@ commit_id_output_file = "$root_gen_dir/angle/id/commit.h" if (angle_use_commit_id) { action("commit_id") { script = "src/commit_id.py" - outputs = [ - commit_id_output_file, - ] + outputs = [ commit_id_output_file ] # commit id should depend on angle's HEAD revision - inputs = [ - ".git/HEAD", - ] + inputs = [ ".git/HEAD" ] args = [ "gen", @@ -458,23 +432,15 @@ if (angle_use_commit_id) { } } else { copy("commit_id") { - sources = [ - "src/commit.h", - ] - outputs = [ - commit_id_output_file, - ] + sources = [ "src/commit.h" ] + outputs = [ commit_id_output_file ] public_configs = [ ":commit_id_config" ] } } angle_source_set("angle_version") { - sources = [ - "src/common/version.h", - ] - public_deps = [ - ":commit_id", - ] + sources = [ "src/common/version.h" ] + public_deps = [ ":commit_id" ] } config("angle_backend_config") { @@ -517,7 +483,8 @@ config("libANGLE_config") { defines += [ "LIBANGLE_IMPLEMENTATION" ] if (is_win) { - cflags += [ "/wd4530" ] # C++ exception handler used, but unwind semantics are not enabled. + cflags += [ "/wd4530" ] # C++ exception handler used, but unwind semantics + # are not enabled. } if (is_android && (angle_enable_gl || angle_enable_vulkan)) { @@ -540,15 +507,11 @@ if (angle_enable_vulkan) { # Use this target to include everything ANGLE needs for Vulkan. group("angle_vulkan") { - public_deps = [ - "$angle_root/third_party/vulkan-headers:vulkan_headers", - ] + public_deps = [ "$angle_root/third_party/vulkan-headers:vulkan_headers" ] public_configs = [ ":vulkan_config" ] data_deps = [] if (!is_android && !is_fuchsia) { - deps = [ - "$angle_root/third_party/vulkan-loader:libvulkan", - ] + deps = [ "$angle_root/third_party/vulkan-loader:libvulkan" ] data_deps += [ "$angle_root/third_party/vulkan-tools:VkICD_mock_icd" ] public_configs += [ "$angle_root/third_party/vulkan-loader:vulkan_loader_config" ] @@ -563,9 +526,7 @@ if (angle_enable_vulkan) { if (angle_enable_vulkan_validation_layers) { if (is_fuchsia) { - deps = [ - "//third_party/fuchsia-sdk:vulkan_validation", - ] + deps = [ "//third_party/fuchsia-sdk:vulkan_validation" ] } else { data_deps += [ "$angle_root/third_party/vulkan-validation-layers:vulkan_validation_layers" ] if (!is_android) { @@ -718,9 +679,7 @@ angle_source_set("libANGLE_base") { # Windows ARM64 is available since 10.0.16299 so no need to copy # d3dcompiler_47.dll because this file is available as inbox. if (is_win && target_cpu != "arm64") { - data_deps = [ - ":copy_compiler_dll", - ] + data_deps = [ ":copy_compiler_dll" ] } } @@ -733,13 +692,9 @@ config("angle_frame_capture_enabled") { } angle_source_set("libANGLE") { - public_deps = [ - ":libANGLE_base", - ] + public_deps = [ ":libANGLE_base" ] public_configs = [ ":angle_frame_capture_disabled" ] - sources = [ - "src/libANGLE/FrameCapture.cpp", - ] + sources = [ "src/libANGLE/FrameCapture.cpp" ] # gl_enum_utils defaults included in with_capture build if (angle_enable_trace || is_debug) { @@ -748,9 +703,7 @@ angle_source_set("libANGLE") { } angle_source_set("libANGLE_with_capture") { - public_deps = [ - ":libANGLE_base", - ] + public_deps = [ ":libANGLE_base" ] public_configs = [ ":angle_frame_capture_enabled" ] sources = libangle_capture_sources } @@ -809,16 +762,12 @@ template("angle_libGLESv2") { deps = invoker.deps + [ ":includes" ] - public_deps = [ - ":angle_version", - ] + public_deps = [ ":angle_version" ] } } angle_libGLESv2("libGLESv2") { - deps = [ - ":libANGLE", - ] + deps = [ ":libANGLE" ] if (angle_with_capture_by_default) { output_name = "libGLESv2_no_capture" @@ -826,9 +775,7 @@ angle_libGLESv2("libGLESv2") { } angle_libGLESv2("libGLESv2_with_capture") { - deps = [ - ":libANGLE_with_capture", - ] + deps = [ ":libANGLE_with_capture" ] if (!angle_with_capture_by_default) { output_name = "libGLESv2_with_capture" @@ -858,9 +805,7 @@ if (is_win) { ":libANGLE", ] - public_deps = [ - ":angle_version", - ] + public_deps = [ ":angle_version" ] } } @@ -868,12 +813,8 @@ angle_static_library("libGLESv2_static") { sources = libglesv2_sources configs += [ ":debug_annotations_config" ] public_configs += [ ":angle_static" ] - deps = [ - ":includes", - ] - public_deps = [ - ":libANGLE", - ] + deps = [ ":includes" ] + public_deps = [ ":libANGLE" ] } angle_shared_library("libGLESv1_CM") { @@ -919,9 +860,7 @@ angle_source_set("libEGL_egl_loader") { ":gl_prototypes", ] - deps = [ - ":includes", - ] + deps = [ ":includes" ] } angle_shared_library("libEGL") { @@ -951,13 +890,9 @@ angle_shared_library("libEGL") { ":libEGL_egl_loader", ] - public_deps = [ - ":includes", - ] + public_deps = [ ":includes" ] - data_deps = [ - ":libGLESv2", - ] + data_deps = [ ":libGLESv2" ] } angle_static_library("libEGL_static") { @@ -993,9 +928,7 @@ angle_source_set("angle_util_loader_headers") { sources += [ "util/windows/wgl_loader_autogen.h" ] } - public_deps = [ - ":includes", - ] + public_deps = [ ":includes" ] } angle_source_set("angle_util_loader") { @@ -1010,9 +943,7 @@ angle_source_set("angle_util_loader") { sources += [ "util/windows/wgl_loader_autogen.cpp" ] } - deps = [ - ":angle_util_loader_headers", - ] + deps = [ ":angle_util_loader_headers" ] public_configs += [ ":angle_util_config", @@ -1137,13 +1068,9 @@ foreach(is_shared_library, angle_executable("angle_shader_translator") { testonly = true - sources = [ - "samples/shader_translator/shader_translator.cpp", - ] + sources = [ "samples/shader_translator/shader_translator.cpp" ] - deps = [ - ":translator", - ] + deps = [ ":translator" ] } config("angle_feature_support_config") { @@ -1214,9 +1141,7 @@ if (!is_component_build && is_android && symbol_level != 0) { } } - outputs = [ - "$root_out_dir/lib.compressed/{{source_file_part}}", - ] + outputs = [ "$root_out_dir/lib.compressed/{{source_file_part}}" ] android_nm = "${android_tool_prefix}nm" android_strip = "${android_tool_prefix}strip" @@ -1245,8 +1170,6 @@ if (!is_component_build && is_android && } group("angle_apks") { - deps = [ - ":angle_chromium_apk", - ] + deps = [ ":angle_chromium_apk" ] } } diff --git a/skia/third_party/externals/angle2/samples/BUILD.gn b/skia/third_party/externals/angle2/samples/BUILD.gn index faac6f3915ea760fc489bd8d5809550243c43c79..8f143a1c539be4f11e99feb9185bd82991cda8d0 100644 --- a/skia/third_party/externals/angle2/samples/BUILD.gn +++ b/skia/third_party/externals/angle2/samples/BUILD.gn @@ -5,13 +5,9 @@ import("../gni/angle.gni") angle_executable("shader_translator") { - sources = [ - "shader_translator/shader_translator.cpp", - ] + sources = [ "shader_translator/shader_translator.cpp" ] include_dirs = [ "../include" ] - deps = [ - "../:translator", - ] + deps = [ "../:translator" ] } config("sample_util_config") { @@ -48,16 +44,12 @@ template("angle_sample") { if (defined(invoker.data)) { copy(target_name + "_data") { sources = invoker.data - outputs = [ - "$root_out_dir/{{source_file_part}}", - ] + outputs = [ "$root_out_dir/{{source_file_part}}" ] } } angle_executable(target_name) { - deps = [ - ":sample_util", - ] + deps = [ ":sample_util" ] if (defined(invoker.data)) { deps += [ ":${target_name}_data" ] } @@ -66,21 +58,15 @@ template("angle_sample") { } angle_sample("hello_triangle") { - sources = [ - "hello_triangle/HelloTriangle.cpp", - ] + sources = [ "hello_triangle/HelloTriangle.cpp" ] } angle_sample("mip_map_2d") { - sources = [ - "mip_map_2d/MipMap2D.cpp", - ] + sources = [ "mip_map_2d/MipMap2D.cpp" ] } angle_sample("multi_texture") { - sources = [ - "multi_texture/MultiTexture.cpp", - ] + sources = [ "multi_texture/MultiTexture.cpp" ] data = [ "multi_texture/basemap.tga", "multi_texture/lightmap.tga", @@ -88,15 +74,11 @@ angle_sample("multi_texture") { } angle_sample("multi_window") { - sources = [ - "multi_window/MultiWindow.cpp", - ] + sources = [ "multi_window/MultiWindow.cpp" ] } angle_sample("multiple_draw_buffers") { - sources = [ - "multiple_draw_buffers/MultipleDrawBuffers.cpp", - ] + sources = [ "multiple_draw_buffers/MultipleDrawBuffers.cpp" ] data = [ "multiple_draw_buffers/multiple_draw_buffers_copy_fs.glsl", "multiple_draw_buffers/multiple_draw_buffers_fs.glsl", @@ -105,108 +87,72 @@ angle_sample("multiple_draw_buffers") { } angle_sample("multiview") { - sources = [ - "multiview/Multiview.cpp", - ] + sources = [ "multiview/Multiview.cpp" ] } angle_sample("particle_system") { - sources = [ - "particle_system/ParticleSystem.cpp", - ] - data = [ - "particle_system/smoke.tga", - ] + sources = [ "particle_system/ParticleSystem.cpp" ] + data = [ "particle_system/smoke.tga" ] } angle_sample("post_sub_buffer") { - sources = [ - "post_sub_buffer/PostSubBuffer.cpp", - ] + sources = [ "post_sub_buffer/PostSubBuffer.cpp" ] } angle_sample("simple_instancing") { - sources = [ - "simple_instancing/SimpleInstancing.cpp", - ] + sources = [ "simple_instancing/SimpleInstancing.cpp" ] } angle_sample("simple_texture_2d") { - sources = [ - "simple_texture_2d/SimpleTexture2D.cpp", - ] + sources = [ "simple_texture_2d/SimpleTexture2D.cpp" ] } angle_sample("simple_texture_cubemap") { - sources = [ - "simple_texture_cubemap/SimpleTextureCubemap.cpp", - ] + sources = [ "simple_texture_cubemap/SimpleTextureCubemap.cpp" ] } angle_sample("simple_vertex_shader") { - sources = [ - "simple_vertex_shader/SimpleVertexShader.cpp", - ] + sources = [ "simple_vertex_shader/SimpleVertexShader.cpp" ] } angle_sample("stencil_operations") { - sources = [ - "stencil_operations/StencilOperations.cpp", - ] + sources = [ "stencil_operations/StencilOperations.cpp" ] } angle_sample("tex_redef_microbench") { - sources = [ - "tex_redef_microbench/TexRedefMicroBench.cpp", - ] + sources = [ "tex_redef_microbench/TexRedefMicroBench.cpp" ] } angle_sample("texture_wrap") { - sources = [ - "texture_wrap/TextureWrap.cpp", - ] + sources = [ "texture_wrap/TextureWrap.cpp" ] } angle_sample("tri_fan_microbench") { - sources = [ - "tri_fan_microbench/TriFanMicroBench.cpp", - ] + sources = [ "tri_fan_microbench/TriFanMicroBench.cpp" ] } angle_sample("window_test") { - sources = [ - "WindowTest/WindowTest.cpp", - ] + sources = [ "WindowTest/WindowTest.cpp" ] } angle_sample("gles1_hello_triangle") { - sources = [ - "gles1/HelloTriangle.cpp", - ] + sources = [ "gles1/HelloTriangle.cpp" ] } angle_sample("gles1_simple_texture_2d") { - sources = [ - "gles1/SimpleTexture2D.cpp", - ] + sources = [ "gles1/SimpleTexture2D.cpp" ] } angle_sample("gles1_simple_lighting") { - sources = [ - "gles1/SimpleLighting.cpp", - ] + sources = [ "gles1/SimpleLighting.cpp" ] } angle_sample("gles1_flat_shading") { - sources = [ - "gles1/FlatShading.cpp", - ] + sources = [ "gles1/FlatShading.cpp" ] } angle_sample("gles1_draw_texture") { - sources = [ - "gles1/DrawTexture.cpp", - ] + sources = [ "gles1/DrawTexture.cpp" ] } group("all") { diff --git a/skia/third_party/externals/angle2/src/common/fuchsia_egl/BUILD.gn b/skia/third_party/externals/angle2/src/common/fuchsia_egl/BUILD.gn index 84a12319023ee43ab6bb051d85511c87df440e02..bba76ed0a28e24c6fc8e9b8d0c1dfef74d0102ad 100644 --- a/skia/third_party/externals/angle2/src/common/fuchsia_egl/BUILD.gn +++ b/skia/third_party/externals/angle2/src/common/fuchsia_egl/BUILD.gn @@ -11,20 +11,12 @@ config("config") { } angle_shared_library("fuchsia_egl") { - sources = [ - "fuchsia_egl.c", - ] - public = [ - "fuchsia_egl.h", - ] - public_configs = [":config"] - deps = [ - ":backend", - ] + sources = [ "fuchsia_egl.c" ] + public = [ "fuchsia_egl.h" ] + public_configs = [ ":config" ] + deps = [ ":backend" ] } angle_source_set("backend") { - public = [ - "fuchsia_egl_backend.h", - ] + public = [ "fuchsia_egl_backend.h" ] } diff --git a/skia/third_party/externals/angle2/src/tests/BUILD.gn b/skia/third_party/externals/angle2/src/tests/BUILD.gn index 7609039835d4191c84b3e87fd1af8f9b36e51864..3e96129d9ffa53b6f23a8d9bdd51aab5348e1807 100644 --- a/skia/third_party/externals/angle2/src/tests/BUILD.gn +++ b/skia/third_party/externals/angle2/src/tests/BUILD.gn @@ -59,20 +59,14 @@ template("angle_tests_main") { source_set(target_name) { testonly = true public_deps = googletest_deps - deps = [ - "${angle_root}:includes", - ] + deps = [ "${angle_root}:includes" ] main = invoker.main if (build_with_chromium) { - sources = [ - "//gpu/$main.cc", - ] + sources = [ "//gpu/$main.cc" ] } else { - sources = [ - "$main.cpp", - ] + sources = [ "$main.cpp" ] } } } @@ -93,9 +87,7 @@ angle_tests_main("angle_perftests_main") { angle_test("angle_unittests_helper") { sources = angle_unittests_helper_sources - deps = [ - "${angle_root}:angle_common", - ] + deps = [ "${angle_root}:angle_common" ] } test_expectations_sources = [ @@ -148,9 +140,7 @@ angle_test("angle_unittests") { if (!is_android && !is_fuchsia) { # SystemUtils.RunApp, the only unittest using a helper binary, is not supported on these # platforms yet. - data_deps = [ - ":angle_unittests_helper", - ] + data_deps = [ ":angle_unittests_helper" ] } } @@ -612,9 +602,11 @@ if (build_angle_deqp_tests && !is_fuchsia) { # TODO(jmadill): Remove this once we fix dEQP. cflags_c = [ "-Wno-unused-local-typedef" ] cflags_cc = [ - "-Wno-string-conversion", # implicit conversion turns string literal into bool + "-Wno-string-conversion", # implicit conversion turns string literal + # into bool "-Wno-unused-local-typedef", - "-Wno-unused-result", # ignoring return value of function declared with 'nodiscard' attribute + "-Wno-unused-result", # ignoring return value of function declared with + # 'nodiscard' attribute ] } @@ -734,9 +726,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { ":angle_deqp_support", ] - public_deps = [ - ":angle_deqp_framework_debase", - ] + public_deps = [ ":angle_deqp_framework_debase" ] } config("angle_deqp_framework_common_config") { @@ -767,9 +757,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { angle_deqp_source_set("angle_deqp_framework_opengl") { sources = deqp_framework_opengl_sources public_configs = [ ":angle_deqp_framework_opengl_config" ] - public_deps = [ - ":angle_deqp_framework_common", - ] + public_deps = [ ":angle_deqp_framework_common" ] } config("angle_deqp_framework_egl_config") { @@ -782,9 +770,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { angle_deqp_source_set("angle_deqp_framework_egl") { sources = deqp_framework_egl_sources public_configs = [ ":angle_deqp_framework_egl_config" ] - public_deps = [ - ":angle_deqp_framework_opengl", - ] + public_deps = [ ":angle_deqp_framework_opengl" ] } config("angle_deqp_framework_qphelper_config") { @@ -806,9 +792,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { angle_deqp_source_set("angle_deqp_glshared") { sources = deqp_glshared_sources - public_deps = [ - ":angle_deqp_framework_opengl", - ] + public_deps = [ ":angle_deqp_framework_opengl" ] public_configs = [ ":angle_deqp_glshared_config" ] } @@ -886,12 +870,8 @@ if (build_angle_deqp_tests && !is_fuchsia) { if (!build_with_chromium) { angle_executable("angle_deqp_${_api}_no_gtest") { - sources = [ - "deqp_support/angle_deqp_tests_main.cpp", - ] - deps = [ - ":$shared_library_name", - ] + sources = [ "deqp_support/angle_deqp_tests_main.cpp" ] + deps = [ ":$shared_library_name" ] } } @@ -902,9 +882,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { ] # Must be included outside of the source set for the define - sources = [ - "deqp_support/angle_deqp_gtest.cpp", - ] + sources = [ "deqp_support/angle_deqp_gtest.cpp" ] data = [ "deqp_support/deqp_${_api}_test_expectations.txt", @@ -931,9 +909,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { defines += [ "ANGLE_DEQP_DATA_DIR=\"data\"" ] mustpass_name = "${_api}-master.txt" - data = [ - "$deqp_path/data/", - ] + data = [ "$deqp_path/data/" ] } } @@ -974,7 +950,8 @@ if (build_angle_deqp_tests && !is_fuchsia) { "$deqp_path/external/openglcts/modules/glesext", ] if (is_clang) { - cflags = [ "-Wno-header-hygiene" ] # using namespace directive in global context in header + cflags = [ "-Wno-header-hygiene" ] # using namespace directive in global + # context in header } } @@ -1023,9 +1000,7 @@ if (build_angle_deqp_tests && !is_fuchsia) { mustpass_dir = _khronos_mustpass - data = [ - "$root_out_dir/$angle_data_dir/gl_cts/", - ] + data = [ "$root_out_dir/$angle_data_dir/gl_cts/" ] } } diff --git a/skia/third_party/externals/angle2/third_party/BUILD.gn b/skia/third_party/externals/angle2/third_party/BUILD.gn index eacbfc14c7f9076292874125b0f9331af49ba608..462f4d4f7f83e6322e5775d12521390d31431daf 100644 --- a/skia/third_party/externals/angle2/third_party/BUILD.gn +++ b/skia/third_party/externals/angle2/third_party/BUILD.gn @@ -25,14 +25,10 @@ group("jpeg") { if (use_system_libjpeg) { public_configs = [ ":system_libjpeg_config" ] } else if (use_libjpeg_turbo) { - public_deps = [ - "//third_party/libjpeg_turbo:libjpeg", - ] + public_deps = [ "//third_party/libjpeg_turbo:libjpeg" ] public_configs = [ ":libjpeg_turbo_config" ] } else { - public_deps = [ - "//third_party/libjpeg:libjpeg", - ] + public_deps = [ "//third_party/libjpeg:libjpeg" ] } } diff --git a/skia/third_party/externals/angle2/third_party/glmark2/BUILD.gn b/skia/third_party/externals/angle2/third_party/glmark2/BUILD.gn index 25ae133986af8fb4d2275632e75e938040d87b0d..a5604da601c0d091c8d97f7721330d8dc86ebb21 100644 --- a/skia/third_party/externals/angle2/third_party/glmark2/BUILD.gn +++ b/skia/third_party/externals/angle2/third_party/glmark2/BUILD.gn @@ -73,9 +73,7 @@ group("glmark2_gles") { ":glmark2_common_config", ":glmark2_gles_config", ] - public_deps = [ - ":glmark2_glad_gles", - ] + public_deps = [ ":glmark2_glad_gles" ] } group("glmark2_gl") { @@ -83,9 +81,7 @@ group("glmark2_gl") { ":glmark2_common_config", ":glmark2_gl_config", ] - public_deps = [ - ":glmark2_glad_gl", - ] + public_deps = [ ":glmark2_glad_gl" ] } # Supplies compatible headers on Win32. @@ -156,23 +152,17 @@ template("glmark2_libmatrix") { if (is_clang) { cflags_cc = [ "-Wno-implicit-fallthrough" ] } - public_deps = [ - ":glmark2_headers", - ] + public_deps = [ ":glmark2_headers" ] public_configs = [ ":glmark2_libmatrix_config" ] } } glmark2_libmatrix("glmark2_libmatrix_gles") { - deps = [ - ":glmark2_gles", - ] + deps = [ ":glmark2_gles" ] } glmark2_libmatrix("glmark2_libmatrix_gl") { - deps = [ - ":glmark2_gl", - ] + deps = [ ":glmark2_gl" ] } config("glmark2_scene_ideas_config") { @@ -345,9 +335,7 @@ template("glmark2_exe") { "src/src/canvas-generic.h", "src/src/main.cpp", ] - data = [ - "src/data/", - ] + data = [ "src/data/" ] defines += [ "GLMARK_VERSION=\"${glmark2_version}\"" ] @@ -370,12 +358,8 @@ template("glmark2_exe") { } glmark2_exe("glmark2_angle") { - sources = [ - "src/src/gl-state-egl.cpp", - ] - deps = [ - ":glmark2_common_gles", - ] + sources = [ "src/src/gl-state-egl.cpp" ] + deps = [ ":glmark2_common_gles" ] data_deps = [ "${angle_root}:libEGL", "${angle_root}:libGLESv2", @@ -399,9 +383,7 @@ if (is_linux) { "src/src/glad/include/glad/glx.h", "src/src/glad/src/glx.c", ] - deps = [ - ":glmark2_common_gl", - ] + deps = [ ":glmark2_common_gl" ] defines = [ "GLMARK2_USE_GLX" ] } @@ -410,12 +392,8 @@ if (is_linux) { # opengl32.lib/opengl32.dll are not available on Windows ARM64. if (is_win && target_cpu != "arm64") { glmark2_exe("glmark2_wgl") { - sources = [ - "src/src/gl-state-wgl.cpp", - ] - deps = [ - ":glmark2_common_gl", - ] + sources = [ "src/src/gl-state-wgl.cpp" ] + deps = [ ":glmark2_common_gl" ] libs = [ "opengl32.lib" ] defines = [ "GLMARK2_USE_WGL" ] diff --git a/skia/third_party/externals/angle2/third_party/libpng/BUILD.gn b/skia/third_party/externals/angle2/third_party/libpng/BUILD.gn index e57015985b151d6e91ebb976fed74bb4a0225d16..fa0012075c076f9d18f6ce11773d10c3754368de 100644 --- a/skia/third_party/externals/angle2/third_party/libpng/BUILD.gn +++ b/skia/third_party/externals/angle2/third_party/libpng/BUILD.gn @@ -29,7 +29,5 @@ static_library("libpng") { } configs -= [ "//build/config/compiler:chromium_code" ] public_configs = [ ":libpng_config" ] - deps = [ - "//third_party/zlib:zlib", - ] + deps = [ "//third_party/zlib:zlib" ] } diff --git a/skia/third_party/externals/angle2/third_party/vulkan-loader/BUILD.gn b/skia/third_party/externals/angle2/third_party/vulkan-loader/BUILD.gn index a919a76f54313db0beb111733d7c429905ddbe42..5e70aa3232bfc6a16c2e2f24bc60ae766e53350f 100644 --- a/skia/third_party/externals/angle2/third_party/vulkan-loader/BUILD.gn +++ b/skia/third_party/externals/angle2/third_party/vulkan-loader/BUILD.gn @@ -94,9 +94,7 @@ copy("python_gen_deps") { "src/scripts/loader_extension_generator.py", "src/scripts/loader_genvk.py", ] - outputs = [ - "$vulkan_gen_dir/{{source_file_part}}", - ] + outputs = [ "$vulkan_gen_dir/{{source_file_part}}" ] } foreach(script_and_dep, helper_script_and_deps) { @@ -104,17 +102,13 @@ foreach(script_and_dep, helper_script_and_deps) { file = script_and_dep[1] dep = script_and_dep[2] target("action", target_name) { - public_deps = [ - ":python_gen_deps", - ] + public_deps = [ ":python_gen_deps" ] script = "$vulkan_gen_dir/loader_genvk.py" inputs = [ "$vulkan_gen_dir/$dep", "$vulkan_gen_dir/common_codegen.py", ] - outputs = [ - "$vulkan_gen_dir/$file", - ] + outputs = [ "$vulkan_gen_dir/$file" ] args = [ "-o", raw_vulkan_gen_dir, @@ -133,9 +127,7 @@ config("vulkan_generated_files_config") { } group("vulkan_generate_helper_files") { - public_deps = [ - "$angle_root/third_party/vulkan-headers:vulkan_headers", - ] + public_deps = [ "$angle_root/third_party/vulkan-headers:vulkan_headers" ] public_configs = [ ":vulkan_generated_files_config" ] foreach(script_and_dep, helper_script_and_deps) { target_name = script_and_dep[0] @@ -224,20 +216,18 @@ if (!is_android) { "/wd4100", # Unreferenced formal parameter "/wd4152", # Nonstandard extension used (pointer conversion) "/wd4201", # Nonstandard extension used: nameless struct/union - "/wd4214", # Nonstandard extension used: bit field types other than int - "/wd4232", # Nonstandard extension used: address of dllimport is not static + "/wd4214", # Nonstandard extension used: bit field types other than + # int + "/wd4232", # Nonstandard extension used: address of dllimport is not + # static "/wd4305", # Type cast truncation "/wd4706", # Assignment within conditional expression "/wd4996", # Unsafe stdlib function ] } } - deps = [ - ":vulkan_generate_helper_files", - ] - public_deps = [ - "$angle_root/third_party/vulkan-headers:vulkan_headers", - ] + deps = [ ":vulkan_generate_helper_files" ] + public_deps = [ "$angle_root/third_party/vulkan-headers:vulkan_headers" ] configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ ":vulkan_internal_config" ] diff --git a/skia/third_party/externals/angle2/third_party/vulkan-tools/BUILD.gn b/skia/third_party/externals/angle2/third_party/vulkan-tools/BUILD.gn index 0fe1abd18ec596fde9611d0e2a096dfea029f09d..d2a837cf555a9afc4491708309fd1f6d2eaec715 100644 --- a/skia/third_party/externals/angle2/third_party/vulkan-tools/BUILD.gn +++ b/skia/third_party/externals/angle2/third_party/vulkan-tools/BUILD.gn @@ -59,9 +59,7 @@ copy("python_gen_deps") { "src/scripts/mock_icd_generator.py", "src/scripts/vulkan_tools_helper_file_generator.py", ] - outputs = [ - "$vulkan_gen_dir/{{source_file_part}}", - ] + outputs = [ "$vulkan_gen_dir/{{source_file_part}}" ] } foreach(script_and_dep, helper_script_and_deps) { @@ -69,17 +67,13 @@ foreach(script_and_dep, helper_script_and_deps) { file = script_and_dep[1] dep = script_and_dep[2] target("action", target_name) { - public_deps = [ - ":python_gen_deps", - ] + public_deps = [ ":python_gen_deps" ] script = "$vulkan_gen_dir/kvt_genvk.py" inputs = [ "$vulkan_gen_dir/$dep", "$vulkan_gen_dir/common_codegen.py", ] - outputs = [ - "$vulkan_gen_dir/$file", - ] + outputs = [ "$vulkan_gen_dir/$file" ] args = [ "-o", raw_vulkan_gen_dir, @@ -98,9 +92,7 @@ config("vulkan_generated_files_config") { } group("vulkan_generate_helper_files") { - public_deps = [ - "$angle_root/third_party/vulkan-headers:vulkan_headers", - ] + public_deps = [ "$angle_root/third_party/vulkan-headers:vulkan_headers" ] public_configs = [ ":vulkan_generated_files_config" ] foreach(script_and_dep, helper_script_and_deps) { target_name = script_and_dep[0] @@ -124,12 +116,9 @@ config("vulkan_internal_config") { # Copy icd header to gen dir copy("icd_header_dep") { - sources = [ - "$angle_root/third_party/vulkan-headers/src/include/vulkan/vk_icd.h", - ] - outputs = [ - "$vulkan_gen_dir/vk_icd.h", - ] + sources = + [ "$angle_root/third_party/vulkan-headers/src/include/vulkan/vk_icd.h" ] + outputs = [ "$vulkan_gen_dir/vk_icd.h" ] } if (!is_android) { @@ -152,12 +141,8 @@ if (!is_android) { shared_library("VkICD_mock_icd") { configs -= vulkan_undefine_configs public_configs = [ "$angle_root:vulkan_config" ] - deps = [ - ":vulkan_generate_mock_icd_files", - ] - data_deps = [ - ":vulkan_gen_icd_json_file", - ] + deps = [ ":vulkan_generate_mock_icd_files" ] + data_deps = [ ":vulkan_gen_icd_json_file" ] sources = mock_icd_sources if (is_win) { sources += [ "src/icd/VkICD_mock_icd.def" ] @@ -168,9 +153,7 @@ if (!is_android) { action("vulkan_gen_icd_json_file") { script = "$angle_root/scripts/generate_vulkan_layers_json.py" - sources = [ - "../vulkan-headers/src/include/vulkan/vulkan_core.h", - ] + sources = [ "../vulkan-headers/src/include/vulkan/vulkan_core.h" ] args = [ "--icd" ] if (is_win) { sources += [ "src/icd/windows/VkICD_mock_icd.json" ] @@ -182,9 +165,7 @@ if (!is_android) { } # The layer JSON files are part of the necessary data deps. - outputs = [ - "$root_out_dir/$angle_data_dir/VkICD_mock_icd.json", - ] + outputs = [ "$root_out_dir/$angle_data_dir/VkICD_mock_icd.json" ] data = outputs args += [ rebase_path("$root_out_dir/$angle_data_dir", root_build_dir) ] + rebase_path(sources, root_build_dir) diff --git a/skia/third_party/externals/angle2/third_party/vulkan-validation-layers/BUILD.gn b/skia/third_party/externals/angle2/third_party/vulkan-validation-layers/BUILD.gn index 36e0800d42e98497407d08228af8f43df10e6858..d2d5f552fb13f6b5a55ad2cbd61fbf775cc2faf7 100644 --- a/skia/third_party/externals/angle2/third_party/vulkan-validation-layers/BUILD.gn +++ b/skia/third_party/externals/angle2/third_party/vulkan-validation-layers/BUILD.gn @@ -142,9 +142,7 @@ copy("python_gen_deps") { "src/scripts/layer_chassis_generator.py", "src/scripts/layer_chassis_dispatch_generator.py", ] - outputs = [ - "$vulkan_gen_dir/{{source_file_part}}", - ] + outputs = [ "$vulkan_gen_dir/{{source_file_part}}" ] } # This special action is needed to remove previously-generated header files. @@ -152,12 +150,8 @@ copy("python_gen_deps") { # failures. action("vulkan_clean_gen_headers") { script = "$angle_root/scripts/remove_files.py" - deps = [ - ":python_gen_deps", - ] - outputs = [ - "$vulkan_gen_dir/vk_validation_error_messages_h_is_removed", - ] + deps = [ ":python_gen_deps" ] + outputs = [ "$vulkan_gen_dir/vk_validation_error_messages_h_is_removed" ] args = [ "$raw_vulkan_gen_dir/vk_validation_error_messages_h_is_removed", "$raw_vulkan_gen_dir/vk_validation_error_messages.h", @@ -169,12 +163,8 @@ action("vulkan_clean_old_validation_layer_objects") { script = "$angle_root/scripts/remove_files.py" # inputs is a (random) new file since the vvl roll, used to ensure the cleanup is done only once - inputs = [ - "src/layers/gpu_validation.cpp", - ] - outputs = [ - "$vulkan_gen_dir/old_vvl_files_are_removed", - ] + inputs = [ "src/layers/gpu_validation.cpp" ] + outputs = [ "$vulkan_gen_dir/old_vvl_files_are_removed" ] args = [ "$raw_vulkan_gen_dir/old_vvl_files_are_removed", "$raw_root_out_dir/libVkLayer*", @@ -199,9 +189,7 @@ foreach(script_and_dep, helper_script_and_deps) { "$vulkan_gen_dir/common_codegen.py", "src/layers/vk_validation_error_messages.h", ] - outputs = [ - "$vulkan_gen_dir/$file", - ] + outputs = [ "$vulkan_gen_dir/$file" ] args = [ "-o", raw_vulkan_gen_dir, @@ -230,12 +218,8 @@ if (spirv_use_commit_id) { # This could be generalized to a foreach if other revisions are added. action("spirv_tools_external_revision_generate") { script = "src/scripts/external_revision_generator.py" - inputs = [ - "//DEPS", - ] - outputs = [ - "$vulkan_gen_dir/spirv_tools_commit_id.h", - ] + inputs = [ "//DEPS" ] + outputs = [ "$vulkan_gen_dir/spirv_tools_commit_id.h" ] args = [ "--git_dir", "$raw_spirv_tools_dir", @@ -247,12 +231,8 @@ if (spirv_use_commit_id) { } } else { copy("spirv_tools_external_revision_generate") { - sources = [ - "dummy_spirv_tools_commit_id.h", - ] - outputs = [ - "$vulkan_gen_dir/spirv_tools_commit_id.h", - ] + sources = [ "dummy_spirv_tools_commit_id.h" ] + outputs = [ "$vulkan_gen_dir/spirv_tools_commit_id.h" ] } } @@ -302,9 +282,9 @@ core_validation_sources = [ "$vulkan_gen_dir/vk_safe_struct.h", "src/layers/buffer_validation.cpp", "src/layers/buffer_validation.h", + "src/layers/convert_to_renderpass2.cpp", "src/layers/core_validation.cpp", "src/layers/core_validation.h", - "src/layers/convert_to_renderpass2.cpp", "src/layers/descriptor_sets.cpp", "src/layers/descriptor_sets.h", "src/layers/gpu_validation.cpp", @@ -359,9 +339,9 @@ unique_objects_deps = [] chassis_deps = [ ":vulkan_gen_layer_chassis_cpp", - ":vulkan_gen_layer_chassis_h", ":vulkan_gen_layer_chassis_dispatch_cpp", ":vulkan_gen_layer_chassis_dispatch_h", + ":vulkan_gen_layer_chassis_h", ] layers = [ @@ -402,9 +382,7 @@ if (!is_android) { action("vulkan_gen_json_files") { script = "$angle_root/scripts/generate_vulkan_layers_json.py" - public_deps = [ - ":vulkan_clean_old_validation_layer_objects", - ] + public_deps = [ ":vulkan_clean_old_validation_layer_objects" ] json_names = [ "VkLayer_core_validation.json", "VkLayer_object_lifetimes.json", @@ -413,9 +391,7 @@ if (!is_android) { "VkLayer_thread_safety.json", "VkLayer_unique_objects.json", ] - sources = [ - "../vulkan-headers/src/include/vulkan/vulkan_core.h", - ] + sources = [ "../vulkan-headers/src/include/vulkan/vulkan_core.h" ] outputs = [] foreach(json_name, json_names) { sources += [ "src/layers/json/$json_name.in" ] @@ -448,9 +424,7 @@ source_set("vulkan_layer_utils") { ] configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - public_deps = [ - ":vulkan_generate_helper_files", - ] + public_deps = [ ":vulkan_generate_helper_files" ] configs -= vulkan_undefine_configs } @@ -488,9 +462,7 @@ foreach(layer_info, layers) { configs += [ "//build/config/compiler:no_chromium_code" ] configs -= vulkan_undefine_configs public_configs = [ ":vulkan_layer_config" ] - deps = [ - ":vulkan_layer_utils", - ] + deps = [ ":vulkan_layer_utils" ] if (layer_info[2] != "") { deps += layer_info[2] } diff --git a/skia/third_party/externals/dawn/BUILD.gn b/skia/third_party/externals/dawn/BUILD.gn index ead3c39b526822c878d77cd879d5bf65502ac34b..28ade2f497374fa1862cc23ee98b35cf52d12901 100644 --- a/skia/third_party/externals/dawn/BUILD.gn +++ b/skia/third_party/externals/dawn/BUILD.gn @@ -62,9 +62,7 @@ if (dawn_enable_opengl) { # Public libdawn_native headers so they can be publically visible for # dependencies of libdawn_native source_set("libdawn_native_headers") { - public_deps = [ - "${dawn_root}/src/dawn:dawn_headers", - ] + public_deps = [ "${dawn_root}/src/dawn:dawn_headers" ] all_dependent_configs = [ "${dawn_root}/src/common:dawn_public_include_dirs" ] sources = [ "src/include/dawn_native/DawnNative.h", @@ -386,17 +384,13 @@ dawn_component("libdawn_native") { DEFINE_PREFIX = "DAWN_NATIVE" #Make headers publically visible - public_deps = [ - ":libdawn_native_headers", - ] + public_deps = [ ":libdawn_native_headers" ] deps = [ ":libdawn_native_sources", "${dawn_root}/src/common", ] - sources = [ - "src/dawn_native/DawnNative.cpp", - ] + sources = [ "src/dawn_native/DawnNative.cpp" ] configs = [ ":libdawn_native_internal" ] if (dawn_enable_d3d12) { @@ -478,9 +472,7 @@ dawn_component("libdawn_wire") { ] # Make headers publically visible - public_deps = [ - "${dawn_root}/src/dawn_wire:libdawn_wire_headers", - ] + public_deps = [ "${dawn_root}/src/dawn_wire:libdawn_wire_headers" ] } ############################################################################### @@ -503,9 +495,7 @@ static_library("dawn_utils") { "src/utils/TerribleCommandBuffer.h", ] - public_deps = [ - "${dawn_root}/src/dawn:dawn_headers", - ] + public_deps = [ "${dawn_root}/src/dawn:dawn_headers" ] deps = [ ":libdawn_native", @@ -719,16 +709,12 @@ test("dawn_end2end_tests") { # Temporary groups to make a 5-way patch to fix crbug.com/913171 group("dawn_unittests_temp_group") { testonly = true - deps = [ - ":dawn_unittests", - ] + deps = [ ":dawn_unittests" ] } group("dawn_end2end_tests_temp_group") { testonly = true - deps = [ - ":dawn_end2end_tests", - ] + deps = [ ":dawn_end2end_tests" ] } ############################################################################### @@ -758,9 +744,7 @@ if (dawn_standalone) { # Template for samples to avoid listing dawn_sample_utils as a dep every time template("dawn_sample") { executable(target_name) { - deps = [ - ":dawn_sample_utils", - ] + deps = [ ":dawn_sample_utils" ] forward_variables_from(invoker, "*", [ "deps" ]) if (defined(invoker.deps)) { @@ -770,39 +754,25 @@ if (dawn_standalone) { } dawn_sample("CppHelloTriangle") { - sources = [ - "examples/CppHelloTriangle.cpp", - ] + sources = [ "examples/CppHelloTriangle.cpp" ] } dawn_sample("CHelloTriangle") { - sources = [ - "examples/CHelloTriangle.cpp", - ] + sources = [ "examples/CHelloTriangle.cpp" ] } dawn_sample("ComputeBoids") { - sources = [ - "examples/ComputeBoids.cpp", - ] - deps = [ - "third_party:glm", - ] + sources = [ "examples/ComputeBoids.cpp" ] + deps = [ "third_party:glm" ] } dawn_sample("Animometer") { - sources = [ - "examples/Animometer.cpp", - ] + sources = [ "examples/Animometer.cpp" ] } dawn_sample("CubeReflection") { - sources = [ - "examples/CubeReflection.cpp", - ] - deps = [ - "third_party:glm", - ] + sources = [ "examples/CubeReflection.cpp" ] + deps = [ "third_party:glm" ] } group("dawn_samples") { diff --git a/skia/third_party/externals/dawn/src/common/BUILD.gn b/skia/third_party/externals/dawn/src/common/BUILD.gn index 0d05c275b3d9463f47d9e771e91d1c71e3384834..8ec5d1f4a08fef73e28c306a393e9cdb3ee254cf 100644 --- a/skia/third_party/externals/dawn/src/common/BUILD.gn +++ b/skia/third_party/externals/dawn/src/common/BUILD.gn @@ -98,13 +98,9 @@ if (is_win || is_linux || is_mac) { ] public_configs = [ ":dawn_internal" ] - deps = [ - "${dawn_root}/src/dawn:dawn_headers", - ] + deps = [ "${dawn_root}/src/dawn:dawn_headers" ] if (dawn_enable_vulkan) { - public_deps = [ - "../../third_party:vulkan_headers", - ] + public_deps = [ "../../third_party:vulkan_headers" ] } } } diff --git a/skia/third_party/externals/dawn/src/dawn/BUILD.gn b/skia/third_party/externals/dawn/src/dawn/BUILD.gn index 7e2efade3ec874ba5ddf2babcf430c5c32eaf183..674d8c360c3b312db244b34cd5743c6181cd385b 100644 --- a/skia/third_party/externals/dawn/src/dawn/BUILD.gn +++ b/skia/third_party/externals/dawn/src/dawn/BUILD.gn @@ -14,8 +14,8 @@ import("../../scripts/dawn_overrides_with_defaults.gni") -import("${dawn_root}/scripts/dawn_component.gni") import("${dawn_root}/generator/dawn_generator.gni") +import("${dawn_root}/scripts/dawn_component.gni") ############################################################################### # Dawn headers @@ -35,9 +35,7 @@ dawn_json_generator("dawn_headers_gen") { source_set("dawn_headers") { all_dependent_configs = [ "${dawn_root}/src/common:dawn_public_include_dirs" ] - deps = [ - ":dawn_headers_gen", - ] + deps = [ ":dawn_headers_gen" ] sources = get_target_outputs(":dawn_headers_gen") sources += [ @@ -62,12 +60,8 @@ dawn_json_generator("libdawn_gen") { dawn_component("libdawn") { DEFINE_PREFIX = "DAWN" - public_deps = [ - ":dawn_headers", - ] + public_deps = [ ":dawn_headers" ] - deps = [ - ":libdawn_gen", - ] + deps = [ ":libdawn_gen" ] sources = get_target_outputs(":libdawn_gen") } diff --git a/skia/third_party/externals/dawn/src/dawn_wire/BUILD.gn b/skia/third_party/externals/dawn/src/dawn_wire/BUILD.gn index c6a6618be1bdfeae8d27a0d2187ed6bf05b353eb..4f73e1fa89c48dc41909a618a5925e1f16f0fc3a 100644 --- a/skia/third_party/externals/dawn/src/dawn_wire/BUILD.gn +++ b/skia/third_party/externals/dawn/src/dawn_wire/BUILD.gn @@ -14,8 +14,8 @@ import("../../scripts/dawn_overrides_with_defaults.gni") -import("${dawn_root}/scripts/dawn_component.gni") import("${dawn_root}/generator/dawn_generator.gni") +import("${dawn_root}/scripts/dawn_component.gni") ############################################################################### # libdawn_wire @@ -24,9 +24,7 @@ import("${dawn_root}/generator/dawn_generator.gni") # Public libdawn_wire headers so they can be publically visible for # dependencies of libdawn_wire source_set("libdawn_wire_headers") { - public_deps = [ - "${dawn_root}/src/dawn:dawn_headers", - ] + public_deps = [ "${dawn_root}/src/dawn:dawn_headers" ] all_dependent_configs = [ "${dawn_root}/src/common:dawn_public_include_dirs" ] sources = [ "${dawn_root}/src/include/dawn_wire/Wire.h", diff --git a/skia/third_party/externals/dawn/src/fuzzers/BUILD.gn b/skia/third_party/externals/dawn/src/fuzzers/BUILD.gn index 2369f94d1cfa2223c54d1c8f28c759a12c7278f0..59ec78037989b77fcacb74fd49a35da9e2fdd032 100644 --- a/skia/third_party/externals/dawn/src/fuzzers/BUILD.gn +++ b/skia/third_party/externals/dawn/src/fuzzers/BUILD.gn @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("../../scripts/dawn_overrides_with_defaults.gni") import("//build_overrides/build.gni") +import("../../scripts/dawn_overrides_with_defaults.gni") # We only have libfuzzer in Chromium builds but if we build fuzzer targets only # there, we would risk breaking fuzzer targets all the time when making changes @@ -74,21 +74,15 @@ static_library("dawn_spirv_cross_fuzzer_common") { "DawnSPIRVCrossFuzzer.cpp", "DawnSPIRVCrossFuzzer.h", ] - public_deps = [ - "${dawn_shaderc_dir}:libshaderc_spvc", - ] + public_deps = [ "${dawn_shaderc_dir}:libshaderc_spvc" ] } # TODO(rharrison): Remove asan_options once signal trap is no longer # needed. # Uses Dawn specific options and varies input data dawn_fuzzer_test("dawn_spirv_cross_glsl_fast_fuzzer") { - sources = [ - "DawnSPIRVCrossGLSLFastFuzzer.cpp", - ] - deps = [ - ":dawn_spirv_cross_fuzzer_common", - ] + sources = [ "DawnSPIRVCrossGLSLFastFuzzer.cpp" ] + deps = [ ":dawn_spirv_cross_fuzzer_common" ] asan_options = [ "allow_user_segv_handler=1" ] } @@ -96,12 +90,8 @@ dawn_fuzzer_test("dawn_spirv_cross_glsl_fast_fuzzer") { # needed. # Uses Dawn specific options and varies input data dawn_fuzzer_test("dawn_spirv_cross_hlsl_fast_fuzzer") { - sources = [ - "DawnSPIRVCrossHLSLFastFuzzer.cpp", - ] - deps = [ - ":dawn_spirv_cross_fuzzer_common", - ] + sources = [ "DawnSPIRVCrossHLSLFastFuzzer.cpp" ] + deps = [ ":dawn_spirv_cross_fuzzer_common" ] asan_options = [ "allow_user_segv_handler=1" ] } @@ -109,19 +99,13 @@ dawn_fuzzer_test("dawn_spirv_cross_hlsl_fast_fuzzer") { # needed. # Uses Dawn specific options and varies input data dawn_fuzzer_test("dawn_spirv_cross_msl_fast_fuzzer") { - sources = [ - "DawnSPIRVCrossMSLFastFuzzer.cpp", - ] - deps = [ - ":dawn_spirv_cross_fuzzer_common", - ] + sources = [ "DawnSPIRVCrossMSLFastFuzzer.cpp" ] + deps = [ ":dawn_spirv_cross_fuzzer_common" ] asan_options = [ "allow_user_segv_handler=1" ] } dawn_fuzzer_test("dawn_wire_server_and_frontend_fuzzer") { - sources = [ - "DawnWireServerAndFrontendFuzzer.cpp", - ] + sources = [ "DawnWireServerAndFrontendFuzzer.cpp" ] deps = [ "${dawn_root}/:libdawn_native_static", diff --git a/skia/third_party/externals/dawn/third_party/BUILD.gn b/skia/third_party/externals/dawn/third_party/BUILD.gn index 01a28a6f2a47cf370eb1cf75d46e74e33281c177..534529e115144802f2669abc0e38bfe617b0625c 100644 --- a/skia/third_party/externals/dawn/third_party/BUILD.gn +++ b/skia/third_party/externals/dawn/third_party/BUILD.gn @@ -12,9 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("../scripts/dawn_overrides_with_defaults.gni") -import("../scripts/dawn_features.gni") import("//build_overrides/build.gni") +import("../scripts/dawn_features.gni") +import("../scripts/dawn_overrides_with_defaults.gni") is_msvc = is_win && !is_clang @@ -147,9 +147,7 @@ source_set("vulkan_headers") { } source_set("khronos_platform") { - sources = [ - "khronos/KHR/khrplatform.h", - ] + sources = [ "khronos/KHR/khrplatform.h" ] public_configs = [ ":khronos_headers_public" ] } @@ -177,9 +175,7 @@ if (!build_with_chromium) { static_library("gtest") { testonly = true - sources = [ - "${googletest_dir}/googletest/src/gtest-all.cc", - ] + sources = [ "${googletest_dir}/googletest/src/gtest-all.cc" ] public_configs = [ ":gtest_config" ] } @@ -193,9 +189,7 @@ if (!build_with_chromium) { static_library("gmock") { testonly = true - sources = [ - "${googletest_dir}/googlemock/src/gmock-all.cc", - ] + sources = [ "${googletest_dir}/googlemock/src/gmock-all.cc" ] public_configs = [ ":gmock_config" ] } diff --git a/skia/third_party/externals/icu/BUILD.gn b/skia/third_party/externals/icu/BUILD.gn index ac47ef21172cb811d0e8e6a5deeddc965cd32304..57d5eba9fc79a2067f32412290b2720323e3cba0 100644 --- a/skia/third_party/externals/icu/BUILD.gn +++ b/skia/third_party/externals/icu/BUILD.gn @@ -82,22 +82,22 @@ config("icu_code") { "/wd4005", # Macro redefinition. "/wd4068", # Unknown pragmas. "/wd4267", # Conversion from size_t on 64-bits. - "/utf-8", # ICU source files are in UTF-8. + "/utf-8", # ICU source files are in UTF-8. ] } else if (is_linux || is_android) { - cflags += [ - "-Wno-unused-function", - ] + cflags += [ "-Wno-unused-function" ] } if (is_clang) { cflags += [ # ICU has some code with the pattern: # if (found = uprv_getWindowsTimeZoneInfo(...)) "-Wno-parentheses", + # ucnv2022.cpp contains three functions that are only used when # certain preprocessor defines are set. # unistr.cpp also has an unused function for non-component builds. "-Wno-unused-function", + # putil.cpp contains unused variables when building for iOS simulators. "-Wno-unused-variable", ] @@ -136,34 +136,35 @@ component("icui18n") { "source/i18n/chnsecal.h", "source/i18n/choicfmt.cpp", "source/i18n/coleitr.cpp", + "source/i18n/coll.cpp", + "source/i18n/collation.cpp", + "source/i18n/collation.h", "source/i18n/collationbuilder.cpp", "source/i18n/collationbuilder.h", "source/i18n/collationcompare.cpp", "source/i18n/collationcompare.h", - "source/i18n/collation.cpp", - "source/i18n/collationdatabuilder.cpp", - "source/i18n/collationdatabuilder.h", "source/i18n/collationdata.cpp", "source/i18n/collationdata.h", + "source/i18n/collationdatabuilder.cpp", + "source/i18n/collationdatabuilder.h", "source/i18n/collationdatareader.cpp", "source/i18n/collationdatareader.h", "source/i18n/collationdatawriter.cpp", "source/i18n/collationdatawriter.h", - "source/i18n/collationfastlatinbuilder.cpp", - "source/i18n/collationfastlatinbuilder.h", "source/i18n/collationfastlatin.cpp", "source/i18n/collationfastlatin.h", + "source/i18n/collationfastlatinbuilder.cpp", + "source/i18n/collationfastlatinbuilder.h", "source/i18n/collationfcd.cpp", "source/i18n/collationfcd.h", - "source/i18n/collation.h", "source/i18n/collationiterator.cpp", "source/i18n/collationiterator.h", "source/i18n/collationkeys.cpp", "source/i18n/collationkeys.h", "source/i18n/collationroot.cpp", + "source/i18n/collationroot.h", "source/i18n/collationrootelements.cpp", "source/i18n/collationrootelements.h", - "source/i18n/collationroot.h", "source/i18n/collationruleparser.cpp", "source/i18n/collationruleparser.h", "source/i18n/collationsets.cpp", @@ -174,7 +175,6 @@ component("icui18n") { "source/i18n/collationtailoring.h", "source/i18n/collationweights.cpp", "source/i18n/collationweights.h", - "source/i18n/coll.cpp", "source/i18n/collunsafe.h", "source/i18n/compactdecimalformat.cpp", "source/i18n/coptccal.cpp", @@ -210,30 +210,30 @@ component("icui18n") { "source/i18n/dcfmtsym.cpp", "source/i18n/decContext.cpp", "source/i18n/decContext.h", - "source/i18n/decimfmt.cpp", "source/i18n/decNumber.cpp", "source/i18n/decNumber.h", "source/i18n/decNumberLocal.h", - "source/i18n/double-conversion-bignum.cpp", + "source/i18n/decimfmt.cpp", "source/i18n/double-conversion-bignum-dtoa.cpp", "source/i18n/double-conversion-bignum-dtoa.h", + "source/i18n/double-conversion-bignum.cpp", "source/i18n/double-conversion-bignum.h", "source/i18n/double-conversion-cached-powers.cpp", "source/i18n/double-conversion-cached-powers.h", - "source/i18n/double-conversion.cpp", "source/i18n/double-conversion-diy-fp.cpp", "source/i18n/double-conversion-diy-fp.h", "source/i18n/double-conversion-fast-dtoa.cpp", "source/i18n/double-conversion-fast-dtoa.h", - "source/i18n/double-conversion.h", "source/i18n/double-conversion-ieee.h", "source/i18n/double-conversion-strtod.cpp", "source/i18n/double-conversion-strtod.h", "source/i18n/double-conversion-utils.h", - "source/i18n/dtfmtsym.cpp", + "source/i18n/double-conversion.cpp", + "source/i18n/double-conversion.h", "source/i18n/dt_impl.h", - "source/i18n/dtitvfmt.cpp", + "source/i18n/dtfmtsym.cpp", "source/i18n/dtitv_impl.h", + "source/i18n/dtitvfmt.cpp", "source/i18n/dtitvinf.cpp", "source/i18n/dtptngen.cpp", "source/i18n/dtptngen_impl.h", @@ -244,8 +244,8 @@ component("icui18n") { "source/i18n/esctrn.h", "source/i18n/ethpccal.cpp", "source/i18n/ethpccal.h", - "source/i18n/fmtable_cnv.cpp", "source/i18n/fmtable.cpp", + "source/i18n/fmtable_cnv.cpp", "source/i18n/fmtableimp.h", "source/i18n/format.cpp", "source/i18n/fphdlimp.cpp", @@ -373,9 +373,9 @@ component("icui18n") { "source/i18n/quantityformatter.h", "source/i18n/rbnf.cpp", "source/i18n/rbt.cpp", + "source/i18n/rbt.h", "source/i18n/rbt_data.cpp", "source/i18n/rbt_data.h", - "source/i18n/rbt.h", "source/i18n/rbt_pars.cpp", "source/i18n/rbt_pars.h", "source/i18n/rbt_rule.cpp", @@ -455,10 +455,10 @@ component("icui18n") { "source/i18n/ucln_in.cpp", "source/i18n/ucln_in.h", "source/i18n/ucol.cpp", - "source/i18n/ucoleitr.cpp", "source/i18n/ucol_imp.h", "source/i18n/ucol_res.cpp", "source/i18n/ucol_sit.cpp", + "source/i18n/ucoleitr.cpp", "source/i18n/ucsdet.cpp", "source/i18n/udat.cpp", "source/i18n/udateintervalformat.cpp", @@ -477,14 +477,14 @@ component("icui18n") { "source/i18n/unum.cpp", "source/i18n/unumsys.cpp", "source/i18n/upluralrules.cpp", - "source/i18n/uregexc.cpp", "source/i18n/uregex.cpp", + "source/i18n/uregexc.cpp", "source/i18n/uregion.cpp", "source/i18n/usearch.cpp", + "source/i18n/uspoof.cpp", "source/i18n/uspoof_build.cpp", "source/i18n/uspoof_conf.cpp", "source/i18n/uspoof_conf.h", - "source/i18n/uspoof.cpp", "source/i18n/uspoof_impl.cpp", "source/i18n/uspoof_impl.h", "source/i18n/usrchimp.h", @@ -509,12 +509,15 @@ component("icui18n") { "source/i18n/zrule.h", "source/i18n/ztrans.cpp", "source/i18n/ztrans.h", + # I18N_SRC_END ] + # ls source/i18n/unicode/*h | sort | sed 's/^\(.*\)$/ "\1",/' public = [ # crbug.com/726654: Make astro.h public until the upstream adds an API. "source/i18n/astro.h", + # I18N_HDR_START "source/i18n/unicode/alphaindex.h", "source/i18n/unicode/basictz.h", @@ -575,11 +578,11 @@ component("icui18n") { "source/i18n/unicode/tzrule.h", "source/i18n/unicode/tztrans.h", "source/i18n/unicode/ucal.h", - "source/i18n/unicode/ucoleitr.h", "source/i18n/unicode/ucol.h", + "source/i18n/unicode/ucoleitr.h", "source/i18n/unicode/ucsdet.h", - "source/i18n/unicode/udateintervalformat.h", "source/i18n/unicode/udat.h", + "source/i18n/unicode/udateintervalformat.h", "source/i18n/unicode/udatpg.h", "source/i18n/unicode/ufieldpositer.h", "source/i18n/unicode/uformattable.h", @@ -588,8 +591,8 @@ component("icui18n") { "source/i18n/unicode/ulocdata.h", "source/i18n/unicode/umsg.h", "source/i18n/unicode/unirepl.h", - "source/i18n/unicode/unumberformatter.h", "source/i18n/unicode/unum.h", + "source/i18n/unicode/unumberformatter.h", "source/i18n/unicode/unumsys.h", "source/i18n/unicode/upluralrules.h", "source/i18n/unicode/uregex.h", @@ -600,13 +603,12 @@ component("icui18n") { "source/i18n/unicode/utmscale.h", "source/i18n/unicode/utrans.h", "source/i18n/unicode/vtzone.h", + # I18N_HDR_END ] defines = [ "U_I18N_IMPLEMENTATION" ] - deps = [ - ":icuuc", - ] + deps = [ ":icuuc" ] # ICU uses RTTI, replace the default "no rtti" config. configs -= [ @@ -642,8 +644,8 @@ component("icuuc") { "source/common/bytesinkutil.cpp", "source/common/bytesinkutil.h", "source/common/bytestream.cpp", - "source/common/bytestriebuilder.cpp", "source/common/bytestrie.cpp", + "source/common/bytestriebuilder.cpp", "source/common/bytestrieiterator.cpp", "source/common/caniter.cpp", "source/common/characterproperties.cpp", @@ -690,8 +692,8 @@ component("icuuc") { "source/common/messagepattern.cpp", "source/common/msvcres.h", "source/common/mutex.h", - "source/common/norm2allmodes.h", "source/common/norm2_nfc_data.h", + "source/common/norm2allmodes.h", "source/common/normalizer2.cpp", "source/common/normalizer2impl.cpp", "source/common/normalizer2impl.h", @@ -702,17 +704,17 @@ component("icuuc") { "source/common/pluralmap.cpp", "source/common/pluralmap.h", "source/common/propname.cpp", - "source/common/propname_data.h", "source/common/propname.h", + "source/common/propname_data.h", "source/common/propsvec.cpp", "source/common/propsvec.h", "source/common/punycode.cpp", "source/common/punycode.h", "source/common/putil.cpp", "source/common/putilimp.h", + "source/common/rbbi.cpp", "source/common/rbbi_cache.cpp", "source/common/rbbi_cache.h", - "source/common/rbbi.cpp", "source/common/rbbidata.cpp", "source/common/rbbidata.h", "source/common/rbbinode.cpp", @@ -727,8 +729,8 @@ component("icuuc") { "source/common/rbbistbl.cpp", "source/common/rbbitblb.cpp", "source/common/rbbitblb.h", - "source/common/resbund_cnv.cpp", "source/common/resbund.cpp", + "source/common/resbund_cnv.cpp", "source/common/resource.cpp", "source/common/resource.h", "source/common/ruleiter.cpp", @@ -756,63 +758,63 @@ component("icuuc") { "source/common/uarrsort.h", "source/common/uassert.h", "source/common/ubidi.cpp", - "source/common/ubidiimp.h", - "source/common/ubidiln.cpp", "source/common/ubidi_props.cpp", - "source/common/ubidi_props_data.h", "source/common/ubidi_props.h", + "source/common/ubidi_props_data.h", + "source/common/ubidiimp.h", + "source/common/ubidiln.cpp", "source/common/ubiditransform.cpp", "source/common/ubidiwrt.cpp", "source/common/ubrk.cpp", "source/common/ubrkimpl.h", "source/common/ucase.cpp", "source/common/ucase.h", + "source/common/ucase_props_data.h", "source/common/ucasemap.cpp", "source/common/ucasemap_imp.h", "source/common/ucasemap_titlecase_brkiter.cpp", - "source/common/ucase_props_data.h", "source/common/ucat.cpp", "source/common/uchar.cpp", "source/common/uchar_props_data.h", - "source/common/ucharstriebuilder.cpp", "source/common/ucharstrie.cpp", + "source/common/ucharstriebuilder.cpp", "source/common/ucharstrieiterator.cpp", "source/common/uchriter.cpp", + "source/common/ucln.h", "source/common/ucln_cmn.cpp", "source/common/ucln_cmn.h", - "source/common/ucln.h", "source/common/ucln_imp.h", "source/common/ucmndata.cpp", "source/common/ucmndata.h", + "source/common/ucnv.cpp", "source/common/ucnv2022.cpp", "source/common/ucnv_bld.cpp", "source/common/ucnv_bld.h", - "source/common/ucnvbocu.cpp", "source/common/ucnv_cb.cpp", "source/common/ucnv_cnv.cpp", "source/common/ucnv_cnv.h", - "source/common/ucnv.cpp", "source/common/ucnv_ct.cpp", - "source/common/ucnvdisp.cpp", "source/common/ucnv_err.cpp", "source/common/ucnv_ext.cpp", "source/common/ucnv_ext.h", - "source/common/ucnvhz.cpp", "source/common/ucnv_imp.h", "source/common/ucnv_io.cpp", "source/common/ucnv_io.h", - "source/common/ucnvisci.cpp", - "source/common/ucnvlat1.cpp", "source/common/ucnv_lmb.cpp", - "source/common/ucnvmbcs.cpp", - "source/common/ucnvmbcs.h", - "source/common/ucnvscsu.cpp", - "source/common/ucnvsel.cpp", "source/common/ucnv_set.cpp", "source/common/ucnv_u16.cpp", "source/common/ucnv_u32.cpp", "source/common/ucnv_u7.cpp", "source/common/ucnv_u8.cpp", + "source/common/ucnvbocu.cpp", + "source/common/ucnvdisp.cpp", + "source/common/ucnvhz.cpp", + "source/common/ucnvisci.cpp", + "source/common/ucnvlat1.cpp", + "source/common/ucnvmbcs.cpp", + "source/common/ucnvmbcs.h", + "source/common/ucnvscsu.cpp", + "source/common/ucnvsel.cpp", "source/common/ucol_data.h", "source/common/ucol_swp.cpp", "source/common/ucol_swp.h", @@ -840,9 +842,9 @@ component("icuuc") { "source/common/ulist.cpp", "source/common/ulist.h", "source/common/uloc.cpp", - "source/common/ulocimp.h", "source/common/uloc_keytype.cpp", "source/common/uloc_tag.cpp", + "source/common/ulocimp.h", "source/common/umapfile.cpp", "source/common/umapfile.h", "source/common/umath.cpp", @@ -854,27 +856,27 @@ component("icuuc") { "source/common/unifiedcache.h", "source/common/unifilt.cpp", "source/common/unifunct.cpp", - "source/common/uniset_closure.cpp", "source/common/uniset.cpp", + "source/common/uniset_closure.cpp", "source/common/uniset_props.cpp", "source/common/unisetspan.cpp", "source/common/unisetspan.h", - "source/common/unistrappender.h", + "source/common/unistr.cpp", "source/common/unistr_case.cpp", "source/common/unistr_case_locale.cpp", "source/common/unistr_cnv.cpp", - "source/common/unistr.cpp", "source/common/unistr_props.cpp", "source/common/unistr_titlecase_brkiter.cpp", - "source/common/unormcmp.cpp", + "source/common/unistrappender.h", "source/common/unorm.cpp", + "source/common/unormcmp.cpp", "source/common/unormimp.h", "source/common/uobject.cpp", "source/common/uposixdefs.h", "source/common/uprops.cpp", "source/common/uprops.h", - "source/common/uresbund.cpp", "source/common/ures_cnv.cpp", + "source/common/uresbund.cpp", "source/common/uresdata.cpp", "source/common/uresdata.h", "source/common/uresimp.h", @@ -885,24 +887,24 @@ component("icuuc") { "source/common/uscript_props.cpp", "source/common/uset.cpp", "source/common/uset_imp.h", - "source/common/usetiter.cpp", "source/common/uset_props.cpp", + "source/common/usetiter.cpp", "source/common/ushape.cpp", "source/common/usprep.cpp", "source/common/ustack.cpp", - "source/common/ustrcase.cpp", - "source/common/ustrcase_locale.cpp", "source/common/ustr_cnv.cpp", "source/common/ustr_cnv.h", + "source/common/ustr_imp.h", + "source/common/ustr_titlecase_brkiter.cpp", + "source/common/ustr_wcs.cpp", + "source/common/ustrcase.cpp", + "source/common/ustrcase_locale.cpp", "source/common/ustrenum.cpp", "source/common/ustrenum.h", "source/common/ustrfmt.cpp", "source/common/ustrfmt.h", - "source/common/ustr_imp.h", "source/common/ustring.cpp", - "source/common/ustr_titlecase_brkiter.cpp", "source/common/ustrtrns.cpp", - "source/common/ustr_wcs.cpp", "source/common/utext.cpp", "source/common/utf_impl.cpp", "source/common/util.cpp", @@ -910,12 +912,12 @@ component("icuuc") { "source/common/util_props.cpp", "source/common/utrace.cpp", "source/common/utracimp.h", - "source/common/utrie2_builder.cpp", + "source/common/utrie.cpp", + "source/common/utrie.h", "source/common/utrie2.cpp", "source/common/utrie2.h", + "source/common/utrie2_builder.cpp", "source/common/utrie2_impl.h", - "source/common/utrie.cpp", - "source/common/utrie.h", "source/common/utrie_swap.cpp", "source/common/uts46.cpp", "source/common/utypeinfo.h", @@ -928,6 +930,7 @@ component("icuuc") { "source/common/uvectr64.h", "source/common/wintz.cpp", "source/common/wintz.h", + # COMMON_SRC_END ] @@ -937,8 +940,8 @@ component("icuuc") { "source/common/unicode/appendable.h", "source/common/unicode/brkiter.h", "source/common/unicode/bytestream.h", - "source/common/unicode/bytestriebuilder.h", "source/common/unicode/bytestrie.h", + "source/common/unicode/bytestriebuilder.h", "source/common/unicode/caniter.h", "source/common/unicode/casemap.h", "source/common/unicode/char16ptr.h", @@ -981,13 +984,13 @@ component("icuuc") { "source/common/unicode/ucasemap.h", "source/common/unicode/ucat.h", "source/common/unicode/uchar.h", - "source/common/unicode/ucharstriebuilder.h", "source/common/unicode/ucharstrie.h", + "source/common/unicode/ucharstriebuilder.h", "source/common/unicode/uchriter.h", "source/common/unicode/uclean.h", + "source/common/unicode/ucnv.h", "source/common/unicode/ucnv_cb.h", "source/common/unicode/ucnv_err.h", - "source/common/unicode/ucnv.h", "source/common/unicode/ucnvsel.h", "source/common/unicode/uconfig.h", "source/common/unicode/ucpmap.h", @@ -1008,8 +1011,8 @@ component("icuuc") { "source/common/unicode/unimatch.h", "source/common/unicode/uniset.h", "source/common/unicode/unistr.h", - "source/common/unicode/unorm2.h", "source/common/unicode/unorm.h", + "source/common/unicode/unorm2.h", "source/common/unicode/uobject.h", "source/common/unicode/urename.h", "source/common/unicode/urep.h", @@ -1022,21 +1025,20 @@ component("icuuc") { "source/common/unicode/ustring.h", "source/common/unicode/ustringtrie.h", "source/common/unicode/utext.h", + "source/common/unicode/utf.h", "source/common/unicode/utf16.h", "source/common/unicode/utf32.h", "source/common/unicode/utf8.h", - "source/common/unicode/utf.h", "source/common/unicode/utf_old.h", "source/common/unicode/utrace.h", "source/common/unicode/utypes.h", "source/common/unicode/uvernum.h", "source/common/unicode/uversion.h", + # COMMON_HDR_END ] defines = [ "U_COMMON_IMPLEMENTATION" ] - deps = [ - ":icudata", - ] + deps = [ ":icudata" ] configs -= [ "//build/config/compiler:no_rtti", # ICU uses RTTI. @@ -1126,6 +1128,7 @@ if (icu_use_data_file) { rebase_path(inputs[0], root_build_dir), rebase_path(data_assembly, root_build_dir), ] + # TODO(GYP): Gyp has considerations here for QNX and for the host # toolchain that have not been ported over. if (is_mac || is_ios) { @@ -1136,7 +1139,7 @@ if (icu_use_data_file) { source_set("icudata") { sources = [ "$data_assembly" ] defines = [ "U_HIDE_DATA_SYMBOL" ] - deps = [ ":make_data_assembly", ] + deps = [ ":make_data_assembly" ] } } } diff --git a/skia/third_party/externals/icu/fuzzers/BUILD.gn b/skia/third_party/externals/icu/fuzzers/BUILD.gn index 3053d79548e8fe5530ac5d9509b617957f9b27b5..fa06968661d67c96927425335c7a222690e330aa 100644 --- a/skia/third_party/externals/icu/fuzzers/BUILD.gn +++ b/skia/third_party/externals/icu/fuzzers/BUILD.gn @@ -4,17 +4,15 @@ # ICU fuzzers. -import("//third_party/icu/config.gni") import("//testing/libfuzzer/fuzzer_test.gni") +import("//third_party/icu/config.gni") # root BUILD depenends on this target. Needed for package discovery group("fuzzers") { } source_set("fuzzer_support") { - public = [ - "fuzzer_utils.h", - ] + public = [ "fuzzer_utils.h" ] deps = [ "//base", "//base:i18n", @@ -24,72 +22,44 @@ source_set("fuzzer_support") { } fuzzer_test("icu_uregex_open_fuzzer") { - sources = [ - "icu_uregex_open_fuzzer.cc", - ] - deps = [ - ":fuzzer_support", - ] + sources = [ "icu_uregex_open_fuzzer.cc" ] + deps = [ ":fuzzer_support" ] dict = "icu_regex.dict" libfuzzer_options = [ "max_len=128" ] } fuzzer_test("icu_unicode_string_codepage_create_fuzzer") { - sources = [ - "icu_unicode_string_codepage_create_fuzzer.cc", - ] - deps = [ - ":fuzzer_support", - ] + sources = [ "icu_unicode_string_codepage_create_fuzzer.cc" ] + deps = [ ":fuzzer_support" ] libfuzzer_options = [ "max_len=10240" ] } fuzzer_test("icu_number_format_fuzzer") { - sources = [ - "icu_number_format_fuzzer.cc", - ] - deps = [ - ":fuzzer_support", - ] + sources = [ "icu_number_format_fuzzer.cc" ] + deps = [ ":fuzzer_support" ] libfuzzer_options = [ "max_len=10240" ] } fuzzer_test("icu_break_iterator_fuzzer") { - sources = [ - "icu_break_iterator_fuzzer.cc", - ] - deps = [ - ":fuzzer_support", - ] + sources = [ "icu_break_iterator_fuzzer.cc" ] + deps = [ ":fuzzer_support" ] libfuzzer_options = [ "max_len=10240" ] } fuzzer_test("icu_break_iterator_utf32_fuzzer") { - sources = [ - "icu_break_iterator_utf32_fuzzer.cc", - ] - deps = [ - ":fuzzer_support", - ] + sources = [ "icu_break_iterator_utf32_fuzzer.cc" ] + deps = [ ":fuzzer_support" ] libfuzzer_options = [ "max_len=10240" ] } fuzzer_test("icu_ucasemap_fuzzer") { - sources = [ - "icu_ucasemap_fuzzer.cc", - ] - deps = [ - ":fuzzer_support", - ] + sources = [ "icu_ucasemap_fuzzer.cc" ] + deps = [ ":fuzzer_support" ] libfuzzer_options = [ "max_len=10240" ] } fuzzer_test("icu_converter_fuzzer") { - sources = [ - "icu_converter_fuzzer.cc", - ] - deps = [ - ":fuzzer_support", - ] + sources = [ "icu_converter_fuzzer.cc" ] + deps = [ ":fuzzer_support" ] libfuzzer_options = [ "max_len=10240" ] } diff --git a/skia/third_party/externals/zlib/BUILD.gn b/skia/third_party/externals/zlib/BUILD.gn index 4764ec1c83c0787b944f4a9c4c9d0651a2af120c..8d8c11b4ef89f15201837f10c784ed82206e5079 100644 --- a/skia/third_party/externals/zlib/BUILD.gn +++ b/skia/third_party/externals/zlib/BUILD.gn @@ -87,9 +87,7 @@ if (use_arm_neon_optimizations) { if (is_android) { import("//build/config/android/config.gni") if (defined(android_ndk_root) && android_ndk_root != "") { - deps = [ - "//third_party/android_tools:cpu_features", - ] + deps = [ "//third_party/android_tools:cpu_features" ] } } @@ -194,9 +192,7 @@ static_library("zlib_x86_simd") { ] } } else { - sources = [ - "simd_stub.c", - ] + sources = [ "simd_stub.c" ] } configs -= [ "//build/config/compiler:chromium_code" ] @@ -313,9 +309,7 @@ static_library("minizip") { defines = [ "USE_FILE32API" ] } - deps = [ - ":zlib", - ] + deps = [ ":zlib" ] configs -= [ "//build/config/compiler:chromium_code" ] configs += [ @@ -331,9 +325,7 @@ static_library("minizip") { executable("zlib_bench") { include_dirs = [ "." ] - sources = [ - "contrib/bench/zlib_bench.cc", - ] + sources = [ "contrib/bench/zlib_bench.cc" ] if (!is_debug) { configs -= [ "//build/config/compiler:default_optimization" ] @@ -343,7 +335,5 @@ executable("zlib_bench") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - deps = [ - ":zlib", - ] + deps = [ ":zlib" ] } diff --git a/skia/third_party/externals/zlib/contrib/tests/fuzzers/BUILD.gn b/skia/third_party/externals/zlib/contrib/tests/fuzzers/BUILD.gn index c46b66440073a5d93ea043fd5009a762925b4392..34c3b43d1f52af26c22830f9f32f8dd2152f4c75 100644 --- a/skia/third_party/externals/zlib/contrib/tests/fuzzers/BUILD.gn +++ b/skia/third_party/externals/zlib/contrib/tests/fuzzers/BUILD.gn @@ -9,37 +9,21 @@ group("fuzzers") { } fuzzer_test("zlib_uncompress_fuzzer") { - sources = [ - "uncompress_fuzzer.cc", - ] - deps = [ - "../../../:zlib", - ] + sources = [ "uncompress_fuzzer.cc" ] + deps = [ "../../../:zlib" ] } fuzzer_test("zlib_inflate_fuzzer") { - sources = [ - "inflate_fuzzer.cc", - ] - deps = [ - "../../../:zlib", - ] + sources = [ "inflate_fuzzer.cc" ] + deps = [ "../../../:zlib" ] } fuzzer_test("zlib_deflate_set_dictionary_fuzzer") { - sources = [ - "deflate_set_dictionary_fuzzer.cc", - ] - deps = [ - "../../../:zlib", - ] + sources = [ "deflate_set_dictionary_fuzzer.cc" ] + deps = [ "../../../:zlib" ] } fuzzer_test("zlib_deflate_fuzzer") { - sources = [ - "deflate_fuzzer.cc", - ] - deps = [ - "../../../:zlib", - ] + sources = [ "deflate_fuzzer.cc" ] + deps = [ "../../../:zlib" ] } diff --git a/skia/third_party/freetype2/BUILD.gn b/skia/third_party/freetype2/BUILD.gn index b76c2df34a50dce49fe38a2780d52aaf9b0f44d5..27145791e4a621034d6b4fe2cf34478c7878c73d 100644 --- a/skia/third_party/freetype2/BUILD.gn +++ b/skia/third_party/freetype2/BUILD.gn @@ -21,9 +21,7 @@ if (skia_use_system_freetype2) { public_defines = [ "SK_FREETYPE_MINIMUM_RUNTIME_VERSION=(((FREETYPE_MAJOR) << 24) | ((FREETYPE_MINOR) << 16) | ((FREETYPE_PATCH) << 8))" ] public_include_dirs = [ "../externals/freetype/include" ] - deps = [ - "//third_party/libpng", - ] + deps = [ "//third_party/libpng" ] include_dirs = [ "." ] defines = [ diff --git a/skia/third_party/harfbuzz/BUILD.gn b/skia/third_party/harfbuzz/BUILD.gn index fd6af89d2d847128c7bd9f17629f172f0a3cdc4e..0d7a9d7f21d6fe4ca3da39ebfcd49693ad7dbf8f 100644 --- a/skia/third_party/harfbuzz/BUILD.gn +++ b/skia/third_party/harfbuzz/BUILD.gn @@ -28,9 +28,7 @@ if (skia_use_system_harfbuzz) { "HAVE_INTEL_ATOMIC_PRIMITIVES", "HAVE_OT", ] - deps = [ - "//third_party/icu", - ] + deps = [ "//third_party/icu" ] public = [ "$_src/hb-blob.h", "$_src/hb-buffer.h", diff --git a/skia/third_party/icu/BUILD.gn b/skia/third_party/icu/BUILD.gn index 50157f0bf1c89c2c97beba5cf98ceefe55ce883a..f7a0fb263cbfa335ce33deb9ccfc2d34e7f24a2f 100644 --- a/skia/third_party/icu/BUILD.gn +++ b/skia/third_party/icu/BUILD.gn @@ -36,14 +36,11 @@ if (skia_use_system_icu) { } action("make_data_assembly") { if (target_cpu == "wasm") { - _u_icu_version_major_num = "63" # defined in source/common/unicode/uvernum.h + _u_icu_version_major_num = + "63" # defined in source/common/unicode/uvernum.h script = "make_data_cpp.py" - inputs = [ - "$data_dir/icudtl.dat", - ] - outputs = [ - data_assembly, - ] + inputs = [ "$data_dir/icudtl.dat" ] + outputs = [ data_assembly ] args = [ "icudt${_u_icu_version_major_num}_dat", rebase_path(inputs[0], root_build_dir), @@ -51,12 +48,8 @@ if (skia_use_system_icu) { ] } else { script = "../externals/icu/scripts/make_data_assembly.py" - inputs = [ - "$data_dir/icudtl.dat", - ] - outputs = [ - "$data_assembly", - ] + inputs = [ "$data_dir/icudtl.dat" ] + outputs = [ "$data_assembly" ] args = [ rebase_path(inputs[0], root_build_dir), rebase_path(data_assembly, root_build_dir), @@ -92,9 +85,7 @@ if (skia_use_system_icu) { } sources = icu_sources if (is_win) { - deps = [ - ":icudata", - ] + deps = [ ":icudata" ] public_defines += [ "U_NOEXCEPT=", "U_STATIC_IMPLEMENTATION", @@ -106,21 +97,13 @@ if (skia_use_system_icu) { ] } else { sources += [ "$data_assembly" ] - deps = [ - ":make_data_assembly", - ] + deps = [ ":make_data_assembly" ] } } copy("icudata") { - sources = [ - "../externals/icu/common/icudtl.dat", - ] - outputs = [ - "$root_out_dir/icudtl.dat", - ] - data = [ - "$root_out_dir/icudtl.dat", - ] + sources = [ "../externals/icu/common/icudtl.dat" ] + outputs = [ "$root_out_dir/icudtl.dat" ] + data = [ "$root_out_dir/icudtl.dat" ] } } diff --git a/skia/third_party/libpng/BUILD.gn b/skia/third_party/libpng/BUILD.gn index 8c3f6f5edd3c7d8b4a832829c0ccad307144bd03..217dbdd185d76af1db641f06e75c0038b5a00ad3 100644 --- a/skia/third_party/libpng/BUILD.gn +++ b/skia/third_party/libpng/BUILD.gn @@ -21,9 +21,7 @@ if (skia_use_system_libpng) { ] defines = [ "PNG_SET_OPTION_SUPPORTED" ] - deps = [ - "//third_party/zlib", - ] + deps = [ "//third_party/zlib" ] sources = [ "../externals/libpng/png.c", "../externals/libpng/pngerror.c", diff --git a/skia/third_party/libwebp/BUILD.gn b/skia/third_party/libwebp/BUILD.gn index cdb645f206eb77eb41ffb085fedd05b61126b233..b3ed5788652722abfed5d6d449c3b042693084b2 100644 --- a/skia/third_party/libwebp/BUILD.gn +++ b/skia/third_party/libwebp/BUILD.gn @@ -54,9 +54,7 @@ if (skia_use_system_libwebp) { "../externals/libwebp", ] - deps = [ - ":libwebp_sse41", - ] + deps = [ ":libwebp_sse41" ] if (is_android) { deps += [ "//third_party/cpu-features" ] } diff --git a/skia/third_party/native_app_glue/BUILD.gn b/skia/third_party/native_app_glue/BUILD.gn index a25065bb605c3497d0ae0dfa0d74adb14e0f5e21..463cfb26a6edd381c42e16f691f067aadd5e3aaa 100644 --- a/skia/third_party/native_app_glue/BUILD.gn +++ b/skia/third_party/native_app_glue/BUILD.gn @@ -11,7 +11,5 @@ import("../third_party.gni") third_party("native_app_glue") { public_include_dirs = [ "$ndk/sources/android/native_app_glue" ] - sources = [ - "$ndk/sources/android/native_app_glue/android_native_app_glue.c", - ] + sources = [ "$ndk/sources/android/native_app_glue/android_native_app_glue.c" ] } diff --git a/skia/third_party/sfntly/BUILD.gn b/skia/third_party/sfntly/BUILD.gn index 4c0c618996eaab40719321fe98cdd490a03a7628..e1adb333d18cff1c43ca14ebbec56479f8219ba3 100644 --- a/skia/third_party/sfntly/BUILD.gn +++ b/skia/third_party/sfntly/BUILD.gn @@ -14,9 +14,7 @@ if (skia_use_icu) { _src = "../externals/sfntly/cpp/src" public_include_dirs = [ _src ] defines = [ "SFNTLY_NO_EXCEPTION" ] - public_deps = [ - "//third_party/icu", - ] + public_deps = [ "//third_party/icu" ] deps = [] if (is_win) { defines += [ "WIN32" ] diff --git a/skia/third_party/spirv-tools/BUILD.gn b/skia/third_party/spirv-tools/BUILD.gn index 039c47256ea60e062669fb655aa660da8f67a6b8..37c2c9252f32521e3f9b157ac7f1b7bba044e3a1 100644 --- a/skia/third_party/spirv-tools/BUILD.gn +++ b/skia/third_party/spirv-tools/BUILD.gn @@ -4,9 +4,7 @@ template("spirv_core_tables") { version = invoker.version action("spirv_core_tables_" + target_name) { script = "../externals/spirv-tools/utils/generate_grammar_tables.py" - sources = [ - "../externals/spirv-headers/include/spirv/$version/spirv.core.grammar.json", - ] + sources = [ "../externals/spirv-headers/include/spirv/$version/spirv.core.grammar.json" ] outputs = [ "$root_out_dir/spirv-tools/core.insts-$version.inc", "$root_out_dir/spirv-tools/operand.kinds-$version.inc", @@ -43,9 +41,7 @@ action("spirv_glsl_tables") { "../externals/spirv-headers/include/spirv/1.0/extinst.glsl.std.450.grammar.json", "../externals/spirv-headers/include/spirv/1.0/spirv.core.grammar.json", ] - outputs = [ - "$root_out_dir/spirv-tools/glsl.std.450.insts-1.0.inc", - ] + outputs = [ "$root_out_dir/spirv-tools/glsl.std.450.insts-1.0.inc" ] args = [ "--spirv-core-grammar=" + rebase_path( "../externals/spirv-headers/include/spirv/1.0/spirv.core.grammar.json", @@ -66,9 +62,7 @@ action("spirv_extension_enum") { "../externals/spirv-headers/include/spirv/1.0/extinst.glsl.std.450.grammar.json", "../externals/spirv-headers/include/spirv/1.0/spirv.core.grammar.json", ] - outputs = [ - "$root_out_dir/spirv-tools/extension_enum.inc", - ] + outputs = [ "$root_out_dir/spirv-tools/extension_enum.inc" ] args = [ "--spirv-core-grammar=" + rebase_path( "../externals/spirv-headers/include/spirv/1.0/spirv.core.grammar.json", @@ -88,9 +82,7 @@ action("spirv_opencl_tables") { "../externals/spirv-headers/include/spirv/1.0/extinst.opencl.std.100.grammar.json", "../externals/spirv-headers/include/spirv/1.0/spirv.core.grammar.json", ] - outputs = [ - "$root_out_dir/spirv-tools/opencl.std.insts-1.0.inc", - ] + outputs = [ "$root_out_dir/spirv-tools/opencl.std.insts-1.0.inc" ] args = [ "--spirv-core-grammar=" + rebase_path( "../externals/spirv-headers/include/spirv/1.0/spirv.core.grammar.json", @@ -109,12 +101,9 @@ template("spirv_vendor_tables") { vendor_table = invoker.vendor_table action("spirv_vendor_tables_" + target_name) { script = "../externals/spirv-tools/utils/generate_grammar_tables.py" - sources = [ - "../externals/spirv-tools/source/extinst.$vendor_table.grammar.json", - ] - outputs = [ - "$root_out_dir/spirv-tools/$vendor_table.insts.inc", - ] + sources = + [ "../externals/spirv-tools/source/extinst.$vendor_table.grammar.json" ] + outputs = [ "$root_out_dir/spirv-tools/$vendor_table.insts.inc" ] args = [ "--extinst-vendor-grammar=" + rebase_path( "../externals/spirv-tools/source/extinst.$vendor_table.grammar.json", @@ -144,12 +133,8 @@ spirv_vendor_tables("amd_shader_ballot") { action("spirv_build_version") { script = "../externals/spirv-tools/utils/update_build_version.py" - sources = [ - "../externals/spirv-tools/CHANGES", - ] - outputs = [ - "$root_out_dir/spirv-tools/build-version.inc", - ] + sources = [ "../externals/spirv-tools/CHANGES" ] + outputs = [ "$root_out_dir/spirv-tools/build-version.inc" ] args = [ rebase_path("../externals/spirv-tools", root_build_dir), rebase_path("$root_out_dir/spirv-tools/build-version.inc", root_build_dir), @@ -158,12 +143,8 @@ action("spirv_build_version") { action("spirv_generators") { script = "../externals/spirv-tools/utils/generate_registry_tables.py" - sources = [ - "../externals/spirv-headers/include/spirv/spir-v.xml", - ] - outputs = [ - "$root_out_dir/spirv-tools/generators.inc", - ] + sources = [ "../externals/spirv-headers/include/spirv/spir-v.xml" ] + outputs = [ "$root_out_dir/spirv-tools/generators.inc" ] args = [ "--xml=" + rebase_path("../externals/spirv-headers/include/spirv/spir-v.xml", diff --git a/skia/third_party/wuffs/BUILD.gn b/skia/third_party/wuffs/BUILD.gn index e0aa7308396a5053d2b08359117ec8891bdd9434..a5d32a7ed5fa55a6c2c94e8d1fcd26f93ff4bd34 100644 --- a/skia/third_party/wuffs/BUILD.gn +++ b/skia/third_party/wuffs/BUILD.gn @@ -45,7 +45,5 @@ third_party("wuffs") { "WUFFS_CONFIG__MODULE__LZW", ] - sources = [ - "../externals/wuffs/release/c/wuffs-v0.2.c", - ] + sources = [ "../externals/wuffs/release/c/wuffs-v0.2.c" ] } diff --git a/skia/third_party/zlib/BUILD.gn b/skia/third_party/zlib/BUILD.gn index a1e4836bf6d5638be9fca11bd19e91cb3e991b33..40d00e916f23ed45035b231931d2330561dc8d9a 100644 --- a/skia/third_party/zlib/BUILD.gn +++ b/skia/third_party/zlib/BUILD.gn @@ -17,9 +17,7 @@ if (skia_use_system_zlib) { third_party("zlib") { public_include_dirs = [ "../externals/zlib" ] - deps = [ - ":zlib_x86", - ] + deps = [ ":zlib_x86" ] sources = [ "../externals/zlib/adler32.c", "../externals/zlib/compress.c", @@ -55,8 +53,6 @@ third_party("zlib_x86") { ] } } else { - sources = [ - "../externals/zlib/simd_stub.c", - ] + sources = [ "../externals/zlib/simd_stub.c" ] } }