Fixup formatting of gn files in the old buildroot. (#174852)

`git ls-files "*.gn*" | xargs ./flutter/third_party/gn/gn format`

We already seem to enforce GN format on pull-requests. These seem to old
files in the buildroot no one has touched in a while.
This commit is contained in:
Chinmay Garde 2025-09-03 10:36:06 -07:00 committed by GitHub
parent d4c9dec4a3
commit 1091786642
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
21 changed files with 145 additions and 136 deletions

View File

@ -347,7 +347,8 @@ default_library_type = "static_library"
# These Sanitizers all imply using the Clang compiler. On Windows they either
# don't work or work differently.
using_sanitizer = !is_win && (is_asan || is_hwasan || is_lsan || is_tsan || is_msan)
using_sanitizer =
!is_win && (is_asan || is_hwasan || is_lsan || is_tsan || is_msan)
if (!is_clang && using_sanitizer) {
is_clang = true
}

View File

@ -32,6 +32,7 @@ config("compiler") {
# x86, arm, armv7, etc.
assert(false, "unsupported cpu: $current_cpu")
}
# OS and deployment target.
if (is_ios) {
_triplet_os = "apple-ios"
@ -40,13 +41,15 @@ config("compiler") {
_triplet_os = "apple-macos"
_deployment_target = mac_deployment_target
}
# Environment.
if (use_ios_simulator) {
_triplet_environment = "-simulator"
} else {
_triplet_environment = ""
}
_target_triplet = "$_triplet_cpu-$_triplet_os$_deployment_target$_triplet_environment"
_target_triplet =
"$_triplet_cpu-$_triplet_os$_deployment_target$_triplet_environment"
# swiftc -swift-version flag.
#
@ -71,6 +74,6 @@ config("compiler") {
"-target",
_target_triplet,
"-swift-version",
_swift_version
_swift_version,
]
}

View File

@ -76,9 +76,7 @@ config("relative_paths") {
"-fdebug-prefix-map=$absolute_path=$relative_path",
]
} else {
cflags += [
"-fdebug-prefix-map=$absolute_path=$relative_path",
]
cflags += [ "-fdebug-prefix-map=$absolute_path=$relative_path" ]
}
cflags += [
# This makes sure that include directories in the toolchain are

View File

@ -40,7 +40,8 @@ template("android_toolchain") {
remote_wrapper = ""
if (host_os == "linux") {
remote_wrapper =
rebase_path("//flutter/build/rbe/remote_wrapper_linux.sh", root_build_dir)
rebase_path("//flutter/build/rbe/remote_wrapper_linux.sh",
root_build_dir)
} else if (host_os == "mac") {
remote_wrapper =
rebase_path("//flutter/build/rbe/remote_wrapper.sh", root_build_dir)
@ -50,10 +51,10 @@ template("android_toolchain") {
local_wrapper =
rebase_path("//flutter/build/rbe/local_wrapper.sh", root_build_dir)
compiler_args = rewrapper_command + [
"--remote_wrapper=$remote_wrapper",
"--local_wrapper=$local_wrapper",
"--labels=type=compile,compiler=clang,lang=cpp ",
]
"--remote_wrapper=$remote_wrapper",
"--local_wrapper=$local_wrapper",
"--labels=type=compile,compiler=clang,lang=cpp ",
]
assembler_prefix = ""
compiler_prefix = string_join(" ", compiler_args)
link_prefix = ""

View File

@ -19,7 +19,7 @@
# speed, you can do:
# export CCACHE_CPP2=yes
import("//build/toolchain/rbe.gni") # for use_rbe
import("//build/toolchain/rbe.gni") # for use_rbe
declare_args() {
# Set to true to enable ccache. Probably doesn't work on windows.

View File

@ -2,9 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/toolchain/ccache.gni")
import("//build/toolchain/clang.gni")
import("//build/toolchain/rbe.gni")
import("//build/toolchain/ccache.gni")
import("//build/toolchain/toolchain.gni")
if (use_rbe) {
@ -25,7 +25,8 @@ toolchain("fuchsia") {
assert(target_cpu == "x64" || target_cpu == "arm64",
"We currently only support 'x64' and 'arm64' targets for fuchsia.")
toolchain_bin =
rebase_path("$buildtools_path/${host_os}-${host_cpu}/clang/bin", root_out_dir)
rebase_path("$buildtools_path/${host_os}-${host_cpu}/clang/bin",
root_out_dir)
fuchsia_sdk = rebase_path("//fuchsia/sdk/$host_os", root_out_dir)
# We can't do string interpolation ($ in strings) on things with dots in

View File

@ -18,10 +18,10 @@ if (use_rbe) {
local_wrapper =
rebase_path("//flutter/build/rbe/local_wrapper.sh", root_build_dir)
compiler_args = rewrapper_command + [
"--remote_wrapper=$remote_wrapper",
"--local_wrapper=$local_wrapper",
"--labels=type=compile,compiler=clang,lang=cpp ",
]
"--remote_wrapper=$remote_wrapper",
"--local_wrapper=$local_wrapper",
"--labels=type=compile,compiler=clang,lang=cpp ",
]
compiler_prefix = string_join(" ", compiler_args)
link_prefix = ""
} else if (use_ccache) {

View File

@ -6,10 +6,10 @@ assert(host_os == "mac")
import("//build/config/darwin/darwin_sdk.gni")
import("//build/config/sysroot.gni")
import("//build/toolchain/ccache.gni")
import("//build/toolchain/clang.gni")
import("//build/toolchain/clang_static_analyzer.gni")
import("//build/toolchain/rbe.gni")
import("//build/toolchain/ccache.gni")
import("//build/toolchain/toolchain.gni")
declare_args() {
@ -45,7 +45,7 @@ if (swift_whole_module_optimization == -1) {
# would be to have inputs to tools (https://crbug.com/621119).
get_tool_mtime = rebase_path("//build/toolchain/darwin/get_tool_mtime.py")
tool_versions = exec_script(
get_tool_mtime, # "get_tool_mtime.py",
get_tool_mtime, # "get_tool_mtime.py",
rebase_path(
[
"//build/toolchain/darwin/swift_const_gather_protocols.json",
@ -73,13 +73,15 @@ if (use_ccache) {
local_wrapper =
rebase_path("//flutter/build/rbe/local_wrapper.sh", root_build_dir)
compiler_args = rewrapper_command + [
"--remote_wrapper=$remote_wrapper",
"--local_wrapper=$local_wrapper",
"--labels=type=compile,compiler=clang,lang=cpp ",
]
"--remote_wrapper=$remote_wrapper",
"--local_wrapper=$local_wrapper",
"--labels=type=compile,compiler=clang,lang=cpp ",
]
cxx_prefix = string_join(" ", compiler_args)
# RBE does not support objc out of the box.
objc_prefix = ""
# Remote links time out without reporting an actionable error.
link_prefix = ""
} else {
@ -95,7 +97,8 @@ template("mac_toolchain") {
assert(defined(invoker.asm), "mac_toolchain() must specify a \"asm\" value")
assert(defined(invoker.cc), "mac_toolchain() must specify a \"cc\" value")
assert(defined(invoker.cxx), "mac_toolchain() must specify a \"cxx\" value")
assert(defined(invoker.objc), "mac_toolchain() must specify a \"objc\" value")
assert(defined(invoker.objc),
"mac_toolchain() must specify a \"objc\" value")
assert(defined(invoker.ld), "mac_toolchain() must specify a \"ld\" value")
assert(defined(invoker.ar), "mac_toolchain() must specify a \"ar\" value")
assert(defined(invoker.toolchain_cpu),
@ -160,7 +163,9 @@ template("mac_toolchain") {
command = "$cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} {{module_deps_no_self}} -fmodule-name={{label_name}} -c -x c++ -Xclang -emit-module {{source}} -o {{output}}"
depsformat = "gcc"
description = "CXX_MODULE {{output}}"
outputs = [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.pcm" ]
outputs = [
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.pcm",
]
}
tool("asm") {
@ -199,7 +204,8 @@ template("mac_toolchain") {
depfile = "{{target_out_dir}}/{{module_name}}.d"
depsformat = "gcc"
_header_path = "{{target_gen_dir}}/{{target_output_name}}/{{target_output_name}}.h"
_header_path =
"{{target_gen_dir}}/{{target_output_name}}/{{target_output_name}}.h"
_output_dir = "{{target_out_dir}}/{{label_name}}"
outputs = [
@ -433,7 +439,8 @@ if (is_ios) {
is_clang = true
sysroot_rel = rebase_path(ios_sdk_path, root_build_dir)
sysroot_flags = "-isysroot $sysroot_rel -miphoneos-version-min=$ios_deployment_target"
sysroot_flags =
"-isysroot $sysroot_rel -miphoneos-version-min=$ios_deployment_target"
}
# Toolchain used for iOS simulator targets (arm64).

View File

@ -19,4 +19,3 @@ gcc_toolchain("qnx") {
toolchain_os = "linux"
is_clang = false
}

View File

@ -44,32 +44,20 @@ rewrapper_command = [
"--exec_root=$rbe_exec_root",
]
if (rbe_server_address != "") {
rewrapper_command += [
"--server_address=$rbe_server_address",
]
rewrapper_command += [ "--server_address=$rbe_server_address" ]
}
if (rbe_exec_strategy != "") {
rewrapper_command += [
"--exec_strategy=$rbe_exec_strategy",
]
rewrapper_command += [ "--exec_strategy=$rbe_exec_strategy" ]
}
if (rbe_dial_timeout != "") {
rewrapper_command += [
"--dial_timeout=$rbe_dial_timeout",
]
rewrapper_command += [ "--dial_timeout=$rbe_dial_timeout" ]
}
if (rbe_exec_timeout != "") {
rewrapper_command += [
"--exec_timeout=$rbe_exec_timeout",
]
rewrapper_command += [ "--exec_timeout=$rbe_exec_timeout" ]
}
if (rbe_reclient_timeout != "") {
rewrapper_command += [
"--reclient_timeout=$rbe_reclient_timeout",
]
rewrapper_command += [ "--reclient_timeout=$rbe_reclient_timeout" ]
}
if (rbe_platform != "") {
rewrapper_command += [
"--platform=$rbe_platform",
]
rewrapper_command += [ "--platform=$rbe_platform" ]
}

View File

@ -35,9 +35,8 @@ assert(is_win)
tool_wrapper_path = rebase_path("tool_wrapper.py", root_build_dir)
if (use_rbe) {
compiler_args = rewrapper_command + [
"--labels=type=compile,compiler=clang-cl,lang=cpp ",
]
compiler_args = rewrapper_command +
[ "--labels=type=compile,compiler=clang-cl,lang=cpp " ]
compiler_prefix = string_join(" ", compiler_args)
asm_prefix = " "
} else {
@ -115,7 +114,9 @@ template("msvc_toolchain") {
pdbname = "{{target_out_dir}}/{{label_name}}_c.pdb"
depsformat = "msvc"
description = "CC {{output}}"
outputs = [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj" ]
outputs = [
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj",
]
# Label names may have spaces in them so the pdbname must be quoted. The
# source and output don't need to be quoted because GN knows they're a
@ -138,7 +139,9 @@ template("msvc_toolchain") {
depsformat = "msvc"
description = "CXX {{output}}"
outputs = [ "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj" ]
outputs = [
"{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj",
]
# See comment in CC tool about quoting.
command = "$env_wrapper$cl /c {{source}} /Fo{{output}} $flags /nologo /showIncludes:user $sys_include_flags{{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} /Fd\"$pdbname\""

View File

@ -4,7 +4,8 @@
config("libcxx_config") {
defines = [ "_LIBCPP_DISABLE_AVAILABILITY=1" ]
include_dirs = [ "//flutter/build/secondary/flutter/third_party/libcxx/config" ]
include_dirs =
[ "//flutter/build/secondary/flutter/third_party/libcxx/config" ]
}
config("src_include") {
@ -71,7 +72,7 @@ source_set("libcxx") {
deps = [
"//flutter/third_party/libcxxabi",
"//flutter/third_party/llvm_libc"
"//flutter/third_party/llvm_libc",
]
# TODO(goderbauer): remove when all sources build with LTO for android_arm64 and android_x64.

View File

@ -22,8 +22,8 @@ source_set("re2") {
"$re2_base/re2/onepass.cc",
"$re2_base/re2/parse.cc",
"$re2_base/re2/perl_groups.cc",
"$re2_base/re2/prefilter_tree.cc",
"$re2_base/re2/prefilter.cc",
"$re2_base/re2/prefilter_tree.cc",
"$re2_base/re2/prog.cc",
"$re2_base/re2/re2.cc",
"$re2_base/re2/re2.h",
@ -42,8 +42,8 @@ source_set("re2") {
"//flutter/third_party/abseil-cpp/absl/base",
"//flutter/third_party/abseil-cpp/absl/container:flat_hash_map",
"//flutter/third_party/abseil-cpp/absl/container:flat_hash_set",
"//flutter/third_party/abseil-cpp/absl/log:check",
"//flutter/third_party/abseil-cpp/absl/log",
"//flutter/third_party/abseil-cpp/absl/log:check",
"//flutter/third_party/abseil-cpp/absl/strings",
]
}

View File

@ -5,7 +5,8 @@
# Custom GN integration for VulkanMemoryAllocator.
declare_args() {
vma_vulkan_headers_dir = "//flutter/third_party/vulkan-deps/vulkan-headers/src"
vma_vulkan_headers_dir =
"//flutter/third_party/vulkan-deps/vulkan-headers/src"
}
config("vulkan_memory_allocator_config") {

View File

@ -69,7 +69,7 @@ config("protobuf_warnings") {
"-Wno-sign-compare",
"-Wno-unused-function",
"-Wno-unused-private-field",
"-Wno-deprecated-declarations", # Mac deprecated sprintf
"-Wno-deprecated-declarations", # Mac deprecated sprintf
]
}
}
@ -530,7 +530,9 @@ if (current_toolchain == host_toolchain) {
}
executable("protoc") {
sources = [ "//flutter/third_party/protobuf/src/google/protobuf/compiler/main.cc" ]
sources = [
"//flutter/third_party/protobuf/src/google/protobuf/compiler/main.cc",
]
deps = [ ":protoc_lib" ]
}
}

View File

@ -138,7 +138,7 @@ template("proto_library") {
assert(!generate_go || !generate_go_grpc,
"Only one of generate_go or generate_go_grpc can be enabled!")
not_needed(invoker, ["propagate_imports_configs"])
not_needed(invoker, [ "propagate_imports_configs" ])
if (defined(invoker.generator_plugin_label)) {
# Straightforward way to get the name of executable doesn't work because
@ -218,10 +218,8 @@ template("proto_library") {
assert(!defined(invoker.generate_descriptor))
descriptor_set_path_ = "${target_out_dir}/${target_name}.desc.pb"
} else if (defined(invoker.generate_descriptor)) {
descriptor_set_path_ =
"$root_gen_dir/" +
rebase_path(proto_out_dir, "//") +
invoker.generate_descriptor
descriptor_set_path_ = "$root_gen_dir/" + rebase_path(proto_out_dir, "//") +
invoker.generate_descriptor
}
if (descriptor_set_path_ != "") {
protogens += [ descriptor_set_path_ ]
@ -255,7 +253,7 @@ template("proto_library") {
}
if (descriptor_set_path_ != "") {
# Descriptor-only protobuf targets do not use |proto_path|
not_needed(["proto_path"])
not_needed([ "proto_path" ])
}
}
@ -471,8 +469,7 @@ template("proto_library") {
# Allows generated protobufs to use #include subpaths rooted from
# |proto_out_dir|.
include_dirs = [ "${root_gen_dir}/" +
rebase_path(proto_out_dir, "//") ]
include_dirs = [ "${root_gen_dir}/" + rebase_path(proto_out_dir, "//") ]
}
}
}

View File

@ -11,8 +11,9 @@ config("shaderc_util_config") {
source_set("shaderc_util_flutter") {
public_configs = [ ":shaderc_util_config" ]
configs +=
[ "//flutter/third_party/vulkan-deps/spirv-tools/src:spvtools_public_config" ]
configs += [
"//flutter/third_party/vulkan-deps/spirv-tools/src:spvtools_public_config",
]
public_deps = [
"//flutter/third_party/vulkan-deps/glslang/src:glslang_sources",
@ -61,8 +62,9 @@ source_set("shaderc_flutter") {
public_configs = [ ":shaderc_config" ]
configs +=
[ "//flutter/third_party/vulkan-deps/spirv-tools/src:spvtools_public_config" ]
configs += [
"//flutter/third_party/vulkan-deps/spirv-tools/src:spvtools_public_config",
]
deps = [ ":shaderc_util_flutter" ]

View File

@ -61,8 +61,6 @@ config("vulkan_layer_config") {
}
vvl_sources = [
"$vulkan_headers_dir/include/vulkan/vk_layer.h",
"$vulkan_headers_dir/include/vulkan/vulkan.h",
"$_checkout_dir/layers/best_practices/best_practices_utils.cpp",
"$_checkout_dir/layers/best_practices/best_practices_validation.h",
"$_checkout_dir/layers/best_practices/bp_buffer.cpp",
@ -102,8 +100,8 @@ vvl_sources = [
"$_checkout_dir/layers/core_checks/cc_copy_blit_resolve.cpp",
"$_checkout_dir/layers/core_checks/cc_descriptor.cpp",
"$_checkout_dir/layers/core_checks/cc_device.cpp",
"$_checkout_dir/layers/core_checks/cc_device_memory.cpp",
"$_checkout_dir/layers/core_checks/cc_device_generated_commands.cpp",
"$_checkout_dir/layers/core_checks/cc_device_memory.cpp",
"$_checkout_dir/layers/core_checks/cc_drawdispatch.cpp",
"$_checkout_dir/layers/core_checks/cc_external_object.cpp",
"$_checkout_dir/layers/core_checks/cc_image.cpp",
@ -138,10 +136,10 @@ vvl_sources = [
"$_checkout_dir/layers/error_message/error_location.cpp",
"$_checkout_dir/layers/error_message/error_location.h",
"$_checkout_dir/layers/error_message/error_strings.h",
"$_checkout_dir/layers/error_message/log_message_type.h",
"$_checkout_dir/layers/error_message/logging.cpp",
"$_checkout_dir/layers/error_message/logging.h",
"$_checkout_dir/layers/error_message/record_object.h",
"$_checkout_dir/layers/error_message/log_message_type.h",
"$_checkout_dir/layers/error_message/spirv_logging.cpp",
"$_checkout_dir/layers/error_message/spirv_logging.h",
"$_checkout_dir/layers/external/inplace_function.h",
@ -149,20 +147,10 @@ vvl_sources = [
"$_checkout_dir/layers/external/vma/vma.cpp",
"$_checkout_dir/layers/external/vma/vma.h",
"$_checkout_dir/layers/external/xxhash.h",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_validation_cmd_common.cpp",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_validation_cmd_common.h",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_copy_buffer_to_image.cpp",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_copy_buffer_to_image.h",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_dispatch.cpp",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_dispatch.h",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_draw.cpp",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_draw.h",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_trace_rays.cpp",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_trace_rays.h",
"$_checkout_dir/layers/gpuav/core/gpuav_settings.h",
"$_checkout_dir/layers/gpuav/core/gpuav.h",
"$_checkout_dir/layers/gpuav/core/gpuav_constants.h",
"$_checkout_dir/layers/gpuav/core/gpuav_record.cpp",
"$_checkout_dir/layers/gpuav/core/gpuav_settings.h",
"$_checkout_dir/layers/gpuav/core/gpuav_setup.cpp",
"$_checkout_dir/layers/gpuav/debug_printf/debug_printf.cpp",
"$_checkout_dir/layers/gpuav/debug_printf/debug_printf.h",
@ -174,51 +162,61 @@ vvl_sources = [
"$_checkout_dir/layers/gpuav/descriptor_validation/gpuav_image_layout.h",
"$_checkout_dir/layers/gpuav/error_message/gpuav_vuids.cpp",
"$_checkout_dir/layers/gpuav/error_message/gpuav_vuids.h",
"$_checkout_dir/layers/gpuav/instrumentation/gpuav_shader_instrumentor.cpp",
"$_checkout_dir/layers/gpuav/instrumentation/gpuav_shader_instrumentor.h",
"$_checkout_dir/layers/gpuav/instrumentation/gpuav_instrumentation.cpp",
"$_checkout_dir/layers/gpuav/instrumentation/gpuav_instrumentation.h",
"$_checkout_dir/layers/gpuav/resources/gpuav_vulkan_objects.cpp",
"$_checkout_dir/layers/gpuav/resources/gpuav_vulkan_objects.h",
"$_checkout_dir/layers/gpuav/instrumentation/gpuav_shader_instrumentor.cpp",
"$_checkout_dir/layers/gpuav/instrumentation/gpuav_shader_instrumentor.h",
"$_checkout_dir/layers/gpuav/resources/gpuav_shader_resources.h",
"$_checkout_dir/layers/gpuav/resources/gpuav_state_trackers.cpp",
"$_checkout_dir/layers/gpuav/resources/gpuav_state_trackers.h",
"$_checkout_dir/layers/gpuav/shaders/validation_cmd/draw_push_data.h",
"$_checkout_dir/layers/gpuav/resources/gpuav_vulkan_objects.cpp",
"$_checkout_dir/layers/gpuav/resources/gpuav_vulkan_objects.h",
"$_checkout_dir/layers/gpuav/shaders/gpuav_error_codes.h",
"$_checkout_dir/layers/gpuav/shaders/gpuav_error_header.h",
"$_checkout_dir/layers/gpuav/shaders/gpuav_shaders_constants.h",
"$_checkout_dir/layers/gpuav/spirv/descriptor_indexing_oob_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/descriptor_indexing_oob_pass.h",
"$_checkout_dir/layers/gpuav/shaders/validation_cmd/draw_push_data.h",
"$_checkout_dir/layers/gpuav/spirv/buffer_device_address_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/buffer_device_address_pass.h",
"$_checkout_dir/layers/gpuav/spirv/debug_printf_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/debug_printf_pass.h",
"$_checkout_dir/layers/gpuav/spirv/descriptor_class_general_buffer_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/descriptor_class_general_buffer_pass.h",
"$_checkout_dir/layers/gpuav/spirv/descriptor_class_texel_buffer_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/descriptor_class_texel_buffer_pass.h",
"$_checkout_dir/layers/gpuav/spirv/buffer_device_address_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/buffer_device_address_pass.h",
"$_checkout_dir/layers/gpuav/spirv/post_process_descriptor_indexing_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/post_process_descriptor_indexing_pass.h",
"$_checkout_dir/layers/gpuav/spirv/vertex_attribute_fetch_oob.cpp",
"$_checkout_dir/layers/gpuav/spirv/vertex_attribute_fetch_oob.h",
"$_checkout_dir/layers/gpuav/spirv/descriptor_indexing_oob_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/descriptor_indexing_oob_pass.h",
"$_checkout_dir/layers/gpuav/spirv/function_basic_block.cpp",
"$_checkout_dir/layers/gpuav/spirv/function_basic_block.h",
"$_checkout_dir/layers/gpuav/spirv/inject_conditional_function_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/inject_conditional_function_pass.h",
"$_checkout_dir/layers/gpuav/spirv/inject_function_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/inject_function_pass.h",
"$_checkout_dir/layers/gpuav/spirv/instruction.cpp",
"$_checkout_dir/layers/gpuav/spirv/instruction.h",
"$_checkout_dir/layers/gpuav/spirv/interface.h",
"$_checkout_dir/layers/gpuav/spirv/link.h",
"$_checkout_dir/layers/gpuav/spirv/module.cpp",
"$_checkout_dir/layers/gpuav/spirv/module.h",
"$_checkout_dir/layers/gpuav/spirv/inject_conditional_function_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/inject_conditional_function_pass.h",
"$_checkout_dir/layers/gpuav/spirv/inject_function_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/inject_function_pass.h",
"$_checkout_dir/layers/gpuav/spirv/pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/pass.h",
"$_checkout_dir/layers/gpuav/spirv/post_process_descriptor_indexing_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/post_process_descriptor_indexing_pass.h",
"$_checkout_dir/layers/gpuav/spirv/ray_query_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/ray_query_pass.h",
"$_checkout_dir/layers/gpuav/spirv/debug_printf_pass.cpp",
"$_checkout_dir/layers/gpuav/spirv/debug_printf_pass.h",
"$_checkout_dir/layers/gpuav/spirv/type_manager.cpp",
"$_checkout_dir/layers/gpuav/spirv/type_manager.h",
"$_checkout_dir/layers/gpuav/spirv/vertex_attribute_fetch_oob.cpp",
"$_checkout_dir/layers/gpuav/spirv/vertex_attribute_fetch_oob.h",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_copy_buffer_to_image.cpp",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_copy_buffer_to_image.h",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_dispatch.cpp",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_dispatch.h",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_draw.cpp",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_draw.h",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_trace_rays.cpp",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_trace_rays.h",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_validation_cmd_common.cpp",
"$_checkout_dir/layers/gpuav/validation_cmd/gpuav_validation_cmd_common.h",
"$_checkout_dir/layers/layer_options.cpp",
"$_checkout_dir/layers/layer_options.h",
"$_checkout_dir/layers/object_tracker/object_lifetime_validation.h",
@ -348,20 +346,6 @@ vvl_sources = [
"$_checkout_dir/layers/vulkan/generated/best_practices_device_methods.h",
"$_checkout_dir/layers/vulkan/generated/best_practices_instance_methods.h",
"$_checkout_dir/layers/vulkan/generated/chassis.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_copy_buffer_to_image_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_copy_buffer_to_image_comp.h",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_dispatch_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_dispatch_comp.h",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_count_buffer_comp.h",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_count_buffer_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_first_instance_comp.h",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_first_instance_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_draw_indexed_indirect_index_buffer_comp.h",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_draw_indexed_indirect_index_buffer_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_draw_mesh_indirect_comp.h",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_draw_mesh_indirect_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_trace_rays_rgen.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_trace_rays_rgen.h",
"$_checkout_dir/layers/vulkan/generated/command_validation.cpp",
"$_checkout_dir/layers/vulkan/generated/device_features.cpp",
"$_checkout_dir/layers/vulkan/generated/device_features.h",
@ -378,20 +362,20 @@ vvl_sources = [
"$_checkout_dir/layers/vulkan/generated/error_location_helper.h",
"$_checkout_dir/layers/vulkan/generated/feature_requirements_helper.cpp",
"$_checkout_dir/layers/vulkan/generated/feature_requirements_helper.h",
"$_checkout_dir/layers/vulkan/generated/instrumentation_descriptor_indexing_oob_bindless_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/instrumentation_descriptor_indexing_oob_bindless_comp.h",
"$_checkout_dir/layers/vulkan/generated/instrumentation_descriptor_indexing_oob_non_bindless_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/instrumentation_descriptor_indexing_oob_non_bindless_comp.h",
"$_checkout_dir/layers/vulkan/generated/instrumentation_buffer_device_address_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/instrumentation_buffer_device_address_comp.h",
"$_checkout_dir/layers/vulkan/generated/instrumentation_descriptor_class_general_buffer_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/instrumentation_descriptor_class_general_buffer_comp.h",
"$_checkout_dir/layers/vulkan/generated/instrumentation_descriptor_class_texel_buffer_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/instrumentation_descriptor_class_texel_buffer_comp.h",
"$_checkout_dir/layers/vulkan/generated/instrumentation_buffer_device_address_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/instrumentation_buffer_device_address_comp.h",
"$_checkout_dir/layers/vulkan/generated/instrumentation_ray_query_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/instrumentation_ray_query_comp.h",
"$_checkout_dir/layers/vulkan/generated/instrumentation_descriptor_indexing_oob_bindless_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/instrumentation_descriptor_indexing_oob_bindless_comp.h",
"$_checkout_dir/layers/vulkan/generated/instrumentation_descriptor_indexing_oob_non_bindless_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/instrumentation_descriptor_indexing_oob_non_bindless_comp.h",
"$_checkout_dir/layers/vulkan/generated/instrumentation_post_process_descriptor_index_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/instrumentation_post_process_descriptor_index_comp.h",
"$_checkout_dir/layers/vulkan/generated/instrumentation_ray_query_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/instrumentation_ray_query_comp.h",
"$_checkout_dir/layers/vulkan/generated/instrumentation_vertex_attribute_fetch_oob_vert.cpp",
"$_checkout_dir/layers/vulkan/generated/instrumentation_vertex_attribute_fetch_oob_vert.h",
"$_checkout_dir/layers/vulkan/generated/object_tracker.cpp",
@ -414,6 +398,20 @@ vvl_sources = [
"$_checkout_dir/layers/vulkan/generated/valid_enum_values.cpp",
"$_checkout_dir/layers/vulkan/generated/valid_enum_values.h",
"$_checkout_dir/layers/vulkan/generated/valid_flag_values.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_copy_buffer_to_image_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_copy_buffer_to_image_comp.h",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_count_buffer_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_count_buffer_comp.h",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_dispatch_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_dispatch_comp.h",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_draw_indexed_indirect_index_buffer_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_draw_indexed_indirect_index_buffer_comp.h",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_draw_mesh_indirect_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_draw_mesh_indirect_comp.h",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_first_instance_comp.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_first_instance_comp.h",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_trace_rays_rgen.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_cmd_trace_rays_rgen.h",
"$_checkout_dir/layers/vulkan/generated/validation_object.cpp",
"$_checkout_dir/layers/vulkan/generated/validation_object_methods.h",
"$_checkout_dir/layers/vulkan/generated/vk_api_version.h",
@ -428,6 +426,8 @@ vvl_sources = [
"$_checkout_dir/layers/vulkan/generated/vk_object_types.cpp",
"$_checkout_dir/layers/vulkan/generated/vk_object_types.h",
"$_checkout_dir/layers/vulkan/generated/vk_validation_error_messages.h",
"$vulkan_headers_dir/include/vulkan/vk_layer.h",
"$vulkan_headers_dir/include/vulkan/vulkan.h",
]
layers = [ [

View File

@ -7,6 +7,7 @@ config("compression_utils_config") {
}
group("compression_utils_portable") {
public_deps = [ "//flutter/third_party/zlib/google:compression_utils_portable" ]
public_deps =
[ "//flutter/third_party/zlib/google:compression_utils_portable" ]
public_configs = [ ":compression_utils_config" ]
}

View File

@ -90,4 +90,4 @@ source_set("boringssl") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
}
}

View File

@ -94,7 +94,6 @@ wasm_toolchain("canvaskit_experimental_webparagraph") {
skia_canvaskit_enable_font = false
skia_canvaskit_enable_alias_font = false
# TODO(mdebbar): Set these to false once all image decoding can be done
# using the browser's built-in codecs.
# https://github.com/flutter/flutter/issues/122331
@ -109,22 +108,26 @@ wasm_toolchain("canvaskit_experimental_webparagraph") {
copy("canvaskit_experimental_webparagraph_group") {
visibility = [ "//flutter/web_sdk:*" ]
public_deps = [ "//flutter/skia/modules/canvaskit(:canvaskit_experimental_webparagraph)" ]
public_deps = [
"//flutter/skia/modules/canvaskit(:canvaskit_experimental_webparagraph)",
]
sources = [
"$root_out_dir/canvaskit_experimental_webparagraph/canvaskit.js",
"$root_out_dir/canvaskit_experimental_webparagraph/canvaskit.js.symbols",
"$root_out_dir/canvaskit_experimental_webparagraph/canvaskit.wasm",
]
outputs = [
"$root_out_dir/flutter_web_sdk/canvaskit/experimental_webparagraph/{{source_file_part}}",
]
outputs = [ "$root_out_dir/flutter_web_sdk/canvaskit/experimental_webparagraph/{{source_file_part}}" ]
}
# This toolchain is only to be used by skwasm_group below.
template("skwasm_toolchain") {
assert(defined(invoker.skwasm_is_heavy))
forward_variables_from(invoker, ["skwasm_is_mt", "skwasm_is_heavy"])
forward_variables_from(invoker,
[
"skwasm_is_mt",
"skwasm_is_heavy",
])
wasm_toolchain(target_name) {
extra_toolchain_args = {
# In Chromium browsers, we can use the browser's APIs to get the necessary
@ -132,7 +135,8 @@ template("skwasm_toolchain") {
skia_use_icu = skwasm_is_heavy
skia_use_client_icu = !skwasm_is_heavy
if (!skwasm_is_heavy) {
skia_icu_bidi_third_party_dir = "//flutter/third_party/canvaskit/icu_bidi"
skia_icu_bidi_third_party_dir =
"//flutter/third_party/canvaskit/icu_bidi"
}
skia_use_libjpeg_turbo_decode = skwasm_is_heavy