コピペ: Skia patch (m85)

形式

Diff

投稿日時

2020-07-09 19:25

公開期間

無期限

 diff --git a/gn/toolchain/BUILD.gn b/gn/toolchain/BUILD.gn
 index 4517710946..f49d3b9b39 100644
 --- a/gn/toolchain/BUILD.gn
 +++ b/gn/toolchain/BUILD.gn
 @@ -67,7 +67,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\" && "
 @@ -201,7 +201,7 @@ toolchain("msvc") {
  
    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}}"
    }
  }
 @@ -341,13 +341,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}}"
      }