haiku
diff --git a/‎Source/ThirdParty/skia/.bazelrc
Lines changed: 5 additions & 40 deletions b/‎Source/ThirdParty/skia/.bazelrc
Lines changed: 5 additions & 40 deletions
diff --git a/‎Source/ThirdParty/skia/.bazelversion
Lines changed: 1 addition & 1 deletion b/‎Source/ThirdParty/skia/.bazelversion
Lines changed: 1 addition & 1 deletion
diff --git a/‎Source/ThirdParty/skia/BUILD.bazel
Lines changed: 12 additions & 77 deletions b/‎Source/ThirdParty/skia/BUILD.bazel
Lines changed: 12 additions & 77 deletions
@@ -25,10 +25,12 @@ build --host_platform=//bazel/platform:host_with_hermetic_toolchain
 # Register our toolchains. We do this here, and not in WORKSPACE.bazel because
 # --extra_toolchains has priority over register_toolchains and we conditionally add some toolchains
 # for RBE.
+build --extra_toolchains=//toolchain:clang_ios_arm64_toolchain
 build --extra_toolchains=//toolchain:clang_linux_x64_toolchain
 build --extra_toolchains=//toolchain:clang_mac_x64_toolchain
 build --extra_toolchains=//toolchain:clang_mac_arm64_toolchain
 build --extra_toolchains=//toolchain:clang_host_mac_x64_target_mac_arm64_toolchain
+build --extra_toolchains=//toolchain:clang_windows_x64_toolchain
 build --extra_toolchains=//toolchain:linux_amd64_ndk_arm64_toolchain
 build --extra_toolchains=//toolchain:linux_amd64_ndk_arm32_toolchain
 
@@ -46,47 +48,8 @@ build --@io_bazel_rules_go//go/config:pure
 # =============================================================================
 # Alias to build configurations below. This makes configuring things from
 # the command line easier.
-#
-# NOTE: Add new enable flags which build new source files, and need to be
-#       included when exporting to other projects (CMake, GNI), to
-#       //bazel/exporter/bazel_query_command.go.
-# Public string flags
-build --flag_alias=gpu_backend=//src/gpu:gpu_backend
-build --flag_alias=include_decoder=//src/codec:include_decoder
-build --flag_alias=include_encoder=//src/encode:include_encoder
-build --flag_alias=include_fontmgr=//bazel/common_config_settings:include_fontmgr
-build --flag_alias=with_gl_standard=//src/gpu:with_gl_standard
-
-# Public boolean flags
-build --flag_alias=disable_discardable_memory=no//src/lazy:enable_discardable_memory
-build --flag_alias=enable_discardable_memory=//src/lazy:enable_discardable_memory
-build --flag_alias=disable_effect_serialization=no//bazel/common_config_settings:enable_effect_serialization
-build --flag_alias=enable_effect_serialization=//bazel/common_config_settings:enable_effect_serialization
-build --flag_alias=disable_legacy_shader_context=no//src/shaders:legacy_shader_context
-build --flag_alias=enable_legacy_shader_context=//src/shaders:legacy_shader_context
-build --flag_alias=disable_native_interface=no//src/gpu/ganesh/gl:enable_native_interface
-build --flag_alias=enable_native_interface=//src/gpu/ganesh/gl:enable_native_interface
-build --flag_alias=disable_pdf_backend=no//src/pdf:enable_pdf_backend
-build --flag_alias=enable_pdf_backend=//src/pdf:enable_pdf_backend
-build --flag_alias=disable_svg_canvas=no//src/svg:enable_svg_canvas
-build --flag_alias=enable_svg_canvas=//src/svg:enable_svg_canvas
-build --flag_alias=disable_tracing=no//bazel/common_config_settings:enable_tracing
-build --flag_alias=enable_tracing=//bazel/common_config_settings:enable_tracing
-build --flag_alias=disable_vma=no//src/gpu:use_vulkan_memory_allocator
-build --flag_alias=enable_vma=//src/gpu:use_vulkan_memory_allocator
-build --flag_alias=with_default_global_memory_pool=//src/lazy:use_default_global_memory_pool
-build --flag_alias=with_no_global_memory_pool=no//src/lazy:use_default_global_memory_pool
-build --flag_alias=with_harfbuzz=//bazel/common_config_settings:use_harfbuzz
-build --flag_alias=with_fontations=//bazel/common_config_settings:use_fontations
-build --flag_alias=with_no_harfbuzz=no//bazel/common_config_settings:use_harfbuzz
-build --flag_alias=with_icu=//bazel/common_config_settings:use_icu
-build --flag_alias=with_no_icu=no//bazel/common_config_settings:use_icu
-build --flag_alias=enable_build_for_debugger=//bazel/common_config_settings:build_for_debugger
-build --flag_alias=disable_build_for_debugger=no//bazel/common_config_settings:build_for_debugger
 
 # Flags used by Skia tools, not to be used by clients
-build --flag_alias=disable_gpu_test_utils=no//src/gpu:enable_gpu_test_utils
-build --flag_alias=enable_gpu_test_utils=//src/gpu:enable_gpu_test_utils
 build --flag_alias=adb_platform=//tools/testrunners/common/android/adb_test_runner:adb_platform
 
 # Public CanvasKit flags
@@ -105,6 +68,8 @@ build --flag_alias=ck_disable_skp_serialization=no//modules/canvaskit:enable_skp
 build --flag_alias=ck_enable_runtime_effect=//modules/canvaskit:enable_runtime_effect
 build --flag_alias=ck_disable_runtime_effect=no//modules/canvaskit:enable_runtime_effect
 build --flag_alias=ck_enable_webgl=//modules/canvaskit:enable_webgl
+build --flag_alias=ck_exclude_debugger=no//modules/canvaskit:build_for_debugger
+build --flag_alias=ck_include_debugger=//modules/canvaskit:build_for_debugger
 
 # =============================================================================
 # REMOTE BUILD EXECUTION
@@ -126,7 +91,7 @@ build:remote --java_runtime_version=rbe_jdk
 build:remote --tool_java_runtime_version=rbe_jdk
 
 # When a remote configuration is chosen, add "remote" to the list of spawn_strategies.
-build:remote --spawn_strategy=remote,sandboxed
+build:remote --spawn_strategy=remote,sandboxed,local
 
 # Enable remote execution so actions are performed on the remote systems.
 build:remote --remote_executor=grpcs://remotebuildexecution.googleapis.com
 
@@ -1 +1 @@
-6.3.2
+7.3.1
@@ -1,8 +1,5 @@
 load("@rules_license//rules:license.bzl", "license")
-load("@skia_user_config//:copts.bzl", "DEFAULT_OBJC_COPTS")
-load("//:defines.bzl", "DEFAULT_DEFINES", "DEFAULT_LOCAL_DEFINES")
 load("//bazel:gen_compile_flags_txt_linux_amd64.bzl", "gen_compile_flags_txt_linux_amd64")
-load("//bazel:skia_rules.bzl", "skia_cc_library", "skia_objc_library")
 
 package(
     default_applicable_licenses = ["//:license"],
@@ -18,80 +15,6 @@ license(
 
 licenses(["notice"])
 
-exports_files(["LICENSE"])
-
-# All the mm files from the Skia library are rolled up to this objc library since cc_library
-# ignores mm files. This private library is then deps'ed into the public and internal versions
-# of the SKia library below. The Skia library Objective-C code requires ARC, while non-library code
-# does not.
-skia_objc_library(
-    name = "skia_objc",
-    srcs = [
-        "//src:objc_srcs",
-    ],
-    copts = DEFAULT_OBJC_COPTS + ["-fobjc-arc"],
-    defines = DEFAULT_DEFINES,
-    deps = [
-        "//src:deps",
-        "@skia_user_config//:user_config",
-    ],
-)
-
-# This target exposes the Skia public API. It is what external clients should use.
-skia_cc_library(
-    name = "skia_public",
-    srcs = [
-        "//include:private_hdrs",
-        "//src:private_hdrs",
-        "//src:srcs",
-    ],
-    hdrs = ["//include:public_hdrs"],
-    defines = DEFAULT_DEFINES,
-    local_defines = DEFAULT_LOCAL_DEFINES,
-    visibility = ["//visibility:public"],
-    deps = [
-        "//src:deps",
-        "@skia_user_config//:user_config",
-    ] + select({
-        "//src/gpu:metal_ganesh": ["//:skia_objc"],
-        "//conditions:default": [],
-    }),
-)
-
-# This target exposes headers beyond the public, supported API. It is intended to be
-# used by Skia's tests and tooling.
-skia_cc_library(
-    name = "skia_internal",
-    srcs = [
-        "//src:srcs",
-    ],
-    hdrs = [
-        "//include:private_hdrs",
-        "//include:public_hdrs",
-        "//src:private_hdrs",
-    ],
-    defines = DEFAULT_DEFINES,
-    local_defines = DEFAULT_LOCAL_DEFINES,
-    visibility = [
-        "//bench:__subpackages__",
-        "//dm:__subpackages__",
-        "//gm:__subpackages__",
-        "//modules:__subpackages__",
-        "//tests:__subpackages__",
-        "//tools:__subpackages__",
-    ],
-    deps = [
-        "//src:deps",
-        "@skia_user_config//:user_config",
-    ] + select({
-        "//src/gpu:metal_ganesh": ["//:skia_objc"],
-        "//conditions:default": [],
-    }),
-)
-
-####################################################################
-# Experimental public buffet targets below
-
 alias(
     name = "core",
     actual = "//src/core:core",
@@ -148,6 +71,12 @@ alias(
     visibility = ["//visibility:public"],
 )
 
+alias(
+    name = "ganesh_gl_win_factory",
+    actual = "//src/gpu/ganesh/gl/win:win_factory",
+    visibility = ["//visibility:public"],
+)
+
 alias(
     name = "ganesh_metal",
     actual = "//src/gpu/ganesh/mtl:ganesh_metal",
@@ -280,6 +209,12 @@ alias(
     visibility = ["//visibility:public"],
 )
 
+alias(
+    name = "fontmgr_empty_fontations",
+    actual = "//src/ports:fontmgr_fontations_empty",
+    visibility = ["//visibility:public"],
+)
+
 ###
 
 alias(