From b0a174dcfc0916b26d5a49b40755181468b85cee Mon Sep 17 00:00:00 2001 From: Peter Varga Date: Thu, 31 May 2018 09:09:40 +0200 Subject: FIXUP: Reintroduce ninja_use_custom_environment_files Windows build fails due to the unused goma_disabled variable if ninja_use_custom_environment_files is disabled. Use disable_goma instead. Change-Id: Iacb316cd1f8519f23aa16f4ce7a3537e2c8d3a88 Reviewed-by: Allan Sandfeld Jensen --- chromium/build/config/win/BUILD.gn | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/chromium/build/config/win/BUILD.gn b/chromium/build/config/win/BUILD.gn index f19b5877dcc..94ba7e6f09b 100644 --- a/chromium/build/config/win/BUILD.gn +++ b/chromium/build/config/win/BUILD.gn @@ -13,12 +13,6 @@ import("//build/toolchain/toolchain.gni") assert(is_win) -if (disable_goma) { - goma_disabled = "true" -} else { - goma_disabled = "false" -} - declare_args() { # Set this to true to enable static analysis through Visual Studio's # /analyze. This dramatically slows compiles and reports thousands of @@ -322,7 +316,7 @@ config("sdk_link") { current_os, current_cpu, "none", - goma_disabled, + disable_goma, ], "scope") } else { -- cgit v1.2.1