Pull new GN binary @ r247206

Additionally, the Windows binary is a debug build to help find a rare assertion failure.

Updates build files to use a list which this new build requires.

Update win-tool link commands to match GYP

TBR=scottmg

Review URL: https://codereview.chromium.org/139283005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247408 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 16 insertions, 16 deletions

diff --git a/base/test/BUILD.gn b/base/test/BUILD.gn
index 3106343..e0475fc 100644
--- a/base/test/BUILD.gn
+++ b/base/test/BUILD.gn
@@ -111,7 +111,7 @@ static_library("test_support_base") {
     # Pull in specific Mac files for iOS (which have been filtered out
     # by file name rules).
     set_sources_assignment_filter([])
-    sources += "test_file_util_mac.cc"
+    sources += [ "test_file_util_mac.cc" ]
   }
   if (toolkit_uses_gtk) {
     configs += [ "//build/config/linux:gtk" ]
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 78ddeea..e0e1073 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -420,7 +420,7 @@ config("chromium_code") {
     # TODO(brettw) this should also be enabled on Linux but some files
     # currently fail.
     if (is_mac) {
-      cflags += "-Wextra"
+      cflags += [ "-Wextra" ]
     }
   }
 }
diff --git a/build/config/win/BUILD.gn b/build/config/win/BUILD.gn
index ffc5d1c..e66bf99 100644
--- a/build/config/win/BUILD.gn
+++ b/build/config/win/BUILD.gn
@@ -85,9 +85,9 @@ config("common_linker_setup") {
   # Chrome.dll don't stick from one launch to the next. For this reason, we
   # turn ASLR off in debug builds.
   if (is_debug) {
-    ldflags += "/DYNAMICBASE:NO"
+    ldflags += [ "/DYNAMICBASE:NO" ]
   } else {
-    ldflags += "/DYNAMICBASE"
+    ldflags += [ "/DYNAMICBASE" ]
   }
 
   # Common libraries.
diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn
index 1bf2001..1c1977b 100644
--- a/build/toolchain/win/BUILD.gn
+++ b/build/toolchain/win/BUILD.gn
@@ -64,14 +64,14 @@ toolchain("32") {
     rspfile_content = "\$in_newline \$libflags"
   }
   tool("solink") {
-    command = "cmd /c $python_path gyp-win-tool link-wrapper environment.x86 link.exe /nologo \$implibflag /DLL /OUT:\$dll /PDB:\$dll.pdb @\$dll.rsp && $python_path gyp-win-tool manifest-wrapper environment.x86 cmd /c if exist \$dll.manifest del \$dll.manifest && $python_path gyp-win-tool manifest-wrapper environment.x86 mt.exe -nologo -manifest \$manifests -out:\$dll.manifest"
+    command = "cmd /c $python_path gyp-win-tool link-wrapper environment.x86 False link.exe /nologo \$implibflag /DLL /OUT:\$dll /PDB:\$dll.pdb @\$dll.rsp && $python_path gyp-win-tool manifest-wrapper environment.x86 cmd /c if exist \$dll.manifest del \$dll.manifest && $python_path gyp-win-tool manifest-wrapper environment.x86 mt.exe -nologo -manifest \$manifests -out:\$dll.manifest"
     description = "LINK(DLL) \$dll"
     restat = "1"
     rspfile = "\$dll.rsp"
     rspfile_content = "\$libs \$in_newline \$ldflags"
   }
   tool("link") {
-    command = "cmd /c $python_path gyp-win-tool link-wrapper environment.x86 link.exe /nologo /OUT:\$out /PDB:\$out.pdb @\$out.rsp && $python_path gyp-win-tool manifest-wrapper environment.x86 cmd /c if exist \$out.manifest del \$out.manifest && $python_path gyp-win-tool manifest-wrapper environment.x86 mt.exe -nologo -manifest \$manifests -out:\$out.manifest"
+    command = "cmd /c $python_path gyp-win-tool link-wrapper environment.x86 False link.exe /nologo /OUT:\$out /PDB:\$out.pdb @\$out.rsp && $python_path gyp-win-tool manifest-wrapper environment.x86 cmd /c if exist \$out.manifest del \$out.manifest && $python_path gyp-win-tool manifest-wrapper environment.x86 mt.exe -nologo -manifest \$manifests -out:\$out.manifest"
     description = "LINK \$out"
     rspfile = "\$out.rsp"
     rspfile_content = "\$in_newline \$libs \$ldflags"
@@ -117,20 +117,20 @@ toolchain("64") {
     description = "ASM \$in"
   }
   tool("alink") {
-    command = "$python_path gyp-win-tool link-wrapper environment.x64 lib.exe /nologo /ignore:4221 /OUT:\$out @\$out.rsp"
+    command = "$python_path gyp-win-tool link-wrapper environment.x64 False lib.exe /nologo /ignore:4221 /OUT:\$out @\$out.rsp"
     description = "LIB \$out"
     rspfile = "\$out.rsp"
     rspfile_content = "\$in_newline \$libflags"
   }
   tool("solink") {
-    command = "cmd /c $python_path gyp-win-tool link-wrapper environment.x64 link.exe /nologo \$implibflag /DLL /OUT:\$dll /PDB:\$dll.pdb @\$dll.rsp && $python_path gyp-win-tool manifest-wrapper environment.x64 cmd /c if exist \$dll.manifest del \$dll.manifest && $python_path gyp-win-tool manifest-wrapper environment.x64 mt.exe -nologo -manifest \$manifests -out:\$dll.manifest"
+    command = "cmd /c $python_path gyp-win-tool link-wrapper environment.x64 False link.exe /nologo \$implibflag /DLL /OUT:\$dll /PDB:\$dll.pdb @\$dll.rsp && $python_path gyp-win-tool manifest-wrapper environment.x64 cmd /c if exist \$dll.manifest del \$dll.manifest && $python_path gyp-win-tool manifest-wrapper environment.x64 mt.exe -nologo -manifest \$manifests -out:\$dll.manifest"
     description = "LINK(DLL) \$dll"
     restat = "1"
     rspfile = "\$dll.rsp"
     rspfile_content = "\$libs \$in_newline \$ldflags"
   }
   tool("link") {
-    command = "cmd /c $python_path gyp-win-tool link-wrapper environment.x64 link.exe /nologo /OUT:\$out /PDB:\$out.pdb @\$out.rsp && $python_path gyp-win-tool manifest-wrapper environment.x64 cmd /c if exist \$out.manifest del \$out.manifest && $python_path gyp-win-tool manifest-wrapper environment.x64 mt.exe -nologo -manifest \$manifests -out:\$out.manifest"
+    command = "cmd /c $python_path gyp-win-tool link-wrapper environment.x64 False link.exe /nologo /OUT:\$out /PDB:\$out.pdb @\$out.rsp && $python_path gyp-win-tool manifest-wrapper environment.x64 cmd /c if exist \$out.manifest del \$out.manifest && $python_path gyp-win-tool manifest-wrapper environment.x64 mt.exe -nologo -manifest \$manifests -out:\$out.manifest"
     description = "LINK \$out"
     rspfile = "\$out.rsp"
     rspfile_content = "\$in_newline \$libs \$ldflags"
diff --git a/tools/gn/bin/linux/gn.sha1 b/tools/gn/bin/linux/gn.sha1
index db8d2a5..f4ff0d4 100644
--- a/tools/gn/bin/linux/gn.sha1
+++ b/tools/gn/bin/linux/gn.sha1
@@ -1 +1 @@
-5bf749c5541cee0770a02461c978ba55f543de6a
\ No newline at end of file
+417b4309b0907468907a09368cebd838d2b2a63b
\ No newline at end of file
diff --git a/tools/gn/bin/linux/gn32.sha1 b/tools/gn/bin/linux/gn32.sha1
index 7314ba5..7e00409 100644
--- a/tools/gn/bin/linux/gn32.sha1
+++ b/tools/gn/bin/linux/gn32.sha1
@@ -1 +1 @@
-9365d347f40c7e62c4446f5f6e8c9fc342c53b64
\ No newline at end of file
+ff38b617db11802089ef0f691044552e44ff0834
\ No newline at end of file
diff --git a/tools/gn/bin/mac/gn.sha1 b/tools/gn/bin/mac/gn.sha1
index 12bbd7d..8d453c7 100644
--- a/tools/gn/bin/mac/gn.sha1
+++ b/tools/gn/bin/mac/gn.sha1
@@ -1 +1 @@
-e39fb773512be2ec846dab49cbde1957282b921e
+f5b88e2eda818d81e44d27a84e56dc6490ca1466
\ No newline at end of file
diff --git a/tools/gn/bin/win/gn.exe.sha1 b/tools/gn/bin/win/gn.exe.sha1
index e9e5f5e..678a32b 100644
--- a/tools/gn/bin/win/gn.exe.sha1
+++ b/tools/gn/bin/win/gn.exe.sha1
@@ -1 +1 @@
-ff548420d90f30779f23abc4f125fd3579493020
+ebb3ccd5d2729d93d1ca72fba0aa061c93b6934b
\ No newline at end of file
diff --git a/tools/gn/secondary/chrome/BUILD.gn b/tools/gn/secondary/chrome/BUILD.gn
index 7ef82aa..0bc8486 100644
--- a/tools/gn/secondary/chrome/BUILD.gn
+++ b/tools/gn/secondary/chrome/BUILD.gn
@@ -152,7 +152,7 @@ source_set("debugger") {
       "browser/devtools/devtools_window.cc",
       "browser/devtools/remote_debugging_server.cc",
     ]
-    deps -= "//third_party/libusb"
+    deps -= [ "//third_party/libusb" ]
   }
 
   # TODO implement debug_devtools
diff --git a/tools/gn/secondary/net/third_party/nss/BUILD.gn b/tools/gn/secondary/net/third_party/nss/BUILD.gn
index 8c3cadf..0815df7 100644
--- a/tools/gn/secondary/net/third_party/nss/BUILD.gn
+++ b/tools/gn/secondary/net/third_party/nss/BUILD.gn
@@ -89,6 +89,6 @@ component("ssl") {
     configs += [ "//third_party/nss:nss_linux_config" ]
   }
   if (is_mac) {
-    sources -= "ssl/bodge/secitem_array.c"
+    sources -= [ "ssl/bodge/secitem_array.c" ]
   }
 }
diff --git a/tools/gn/secondary/skia/BUILD.gn b/tools/gn/secondary/skia/BUILD.gn
index fcc09fa..4643cdc 100644
--- a/tools/gn/secondary/skia/BUILD.gn
+++ b/tools/gn/secondary/skia/BUILD.gn
@@ -1232,7 +1232,7 @@ if (component_mode == "static_library") {
     }
 
     if (skia_support_pdf) {
-      deps += "//third_party/sfntly"
+      deps += [ "//third_party/sfntly" ]
     }
   }
 }