From d434b01c7e589b721c7969d7dfc6a25f99bdc23b Mon Sep 17 00:00:00 2001
From: mtklein <mtklein@chromium.org>
Date: Wed, 10 Aug 2016 07:30:58 -0700
Subject: Roll GN: gn format is --in-place by default

As usual, might as well roll, and this new behavior is a small convenience.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2231833002

Review-Url: https://codereview.chromium.org/2231833002
---
 DEPS         | 2 +-
 PRESUBMIT.py | 5 ++---
 gn/BUILD.gn  | 6 ++++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/DEPS b/DEPS
index 3944dabf46..62f6fd9b05 100644
--- a/DEPS
+++ b/DEPS
@@ -3,7 +3,7 @@ use_relative_paths = True
 # Dependencies on outside packages.
 #
 deps = {
-  "buildtools":  "https://chromium.googlesource.com/chromium/buildtools.git@9c6ad6f5cbc2f30989edc3504ec7f9d360542512",
+  "buildtools":  "https://chromium.googlesource.com/chromium/buildtools.git@33a32b8aa2b7274d246fcf85ce8f762cf4291418",
 
   "common": "https://skia.googlesource.com/common.git@c282fe0b6e392b14f88d647cbd86e1a3ef5498e0",
 
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 95fea4f8db..3fd8314f0b 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -196,10 +196,9 @@ def _CheckGNFormatted(input_api, output_api):
     try:
       subprocess.check_output(cmd)
     except subprocess.CalledProcessError:
-      fix = cmd[:]
-      fix[2] = '--in-place'
+      fix = 'gn format ' + f.LocalPath()
       results.append(output_api.PresubmitError(
-          '`%s` failed, try\n\t%s' % (' '.join(cmd), ' '.join(fix))))
+          '`%s` failed, try\n\t%s' % (' '.join(cmd), fix)))
   return results
 
 
diff --git a/gn/BUILD.gn b/gn/BUILD.gn
index 48bd90f639..1f7bd82bf2 100644
--- a/gn/BUILD.gn
+++ b/gn/BUILD.gn
@@ -54,6 +54,10 @@ config("executable") {
   }
 }
 
+pool("link_pool") {
+  depth = 0  #unlimited
+}
+
 toolchain("gcc_like") {
   lib_switch = "-l"
   lib_dir_switch = "-L"
@@ -113,6 +117,7 @@ toolchain("gcc_like") {
     output_prefix = "lib"
     default_output_extension = ".so"
     description = "$cxx -shared ... -o {{output}}"
+    pool = ":link_pool"
   }
 
   tool("link") {
@@ -121,6 +126,7 @@ toolchain("gcc_like") {
       "{{root_out_dir}}/{{target_output_name}}{{output_extension}}",
     ]
     description = "$cxx ... -o {{output}}"
+    pool = ":link_pool"
   }
 
   tool("stamp") {
-- 
cgit v1.2.3