コピペ: Skia m89 patch

形式

Diff

投稿日時

2021-02-02 18:59

公開期間

無期限

 diff --git a/BUILD.gn b/BUILD.gn
 index ed22479622..c42477c3db 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
 @@ -100,7 +100,7 @@ config("skia_private") {
  
  # Any code that's linked into Skia-the-library should use this config via += skia_library_configs.
  config("skia_library") {
 -  visibility = [ ":*" ]
 +  # visibility = [ ":*" ]
    defines = [ "SKIA_IMPLEMENTATION=1" ]
  }
  
 diff --git a/gn/toolchain/BUILD.gn b/gn/toolchain/BUILD.gn
 index 8029086eff..b0ead2e222 100644
 --- a/gn/toolchain/BUILD.gn
 +++ b/gn/toolchain/BUILD.gn
 @@ -86,7 +86,7 @@ toolchain("msvc") {
    if (target_cpu == "x86") {
      # Toolchain asset includes a script that configures for x86 building.
      # We don't support x86 builds with local MSVC installations.
 -    env_setup = "$shell $win_sdk/bin/SetEnv.cmd /x86 && "
 +    # env_setup = "$shell $win_sdk/bin/SetEnv.cmd /x86 && "
    } else if (target_cpu == "arm64") {
      # ARM64 compiler is incomplete - it relies on DLLs located in the host toolchain directory.
      env_setup = "$shell set \"PATH=%PATH%;$win_vc\\Tools\\MSVC\\$win_toolchain_version\\bin\\HostX64\\x64\" && "
 @@ -379,13 +379,13 @@ template("gcc_like_toolchain") {
  
      tool("copy") {
        cp_py = rebase_path("../cp.py")
 -      command = "python \"$cp_py\" {{source}} {{output}}"
 +      command = "$shell python \"$cp_py\" {{source}} {{output}}"
        description = "copy {{source}} {{output}}"
      }
  
      tool("copy_bundle_data") {
        cp_py = rebase_path("../cp.py")
 -      command = "python \"$cp_py\" {{source}} {{output}}"
 +      command = "$shell python \"$cp_py\" {{source}} {{output}}"
        description = "copy_bundle_data {{source}} {{output}}"
      }