From cbd7bb4cd2845b2ae56e1d3318ec879031378f32 Mon Sep 17 00:00:00 2001
From: Mark Mentovai <mark@chromium.org>
Date: Wed, 27 Sep 2017 16:43:35 -0400
Subject: [PATCH] Only run GYP for Windows targets on Windows
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This prevents GYP from running on macOS, where it would produce a bunch
of pointless .xcodeproj directories for Windows libraries and tools that
could never possibly build. Those would pollute “git status” output and
other operations.

Check in a new default.xml generated from DEPS too. It doesn’t
correspond to this change, but I should have done this in 26b988681d5b.

Change-Id: I034a5b30d13fdcc14911fc1354504375752d6144
Reviewed-on: https://chromium-review.googlesource.com/688045
Reviewed-by: Robert Sesek <rsesek@chromium.org>
---
 DEPS        | 37 +++++++++++++++++++++----------------
 default.xml |  2 +-
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/DEPS b/DEPS
index db7f72d2..a13a181a 100644
--- a/DEPS
+++ b/DEPS
@@ -55,25 +55,30 @@ deps = {
 }
 
 hooks = [
-  {
-    # TODO(chrisha): Fix the GYP files so that they work without
-    # --no-circular-check.
-    "pattern": ".",
-    "action": ["python",
-               "src/src/tools/gyp/gyp_main.py",
-               "--no-circular-check",
-               "src/src/client/windows/breakpad_client.gyp"],
-  },
-  {
-    # XXX: this and above should all be wired into build/all.gyp ?
-    "action": ["python",
-               "src/src/tools/gyp/gyp_main.py",
-               "--no-circular-check",
-               "src/src/tools/windows/tools_windows.gyp"],
-  },
   {
     # Keep the manifest up to date.
     "action": ["python", "src/src/tools/python/deps-to-manifest.py",
                "src/DEPS", "src/default.xml"],
   },
 ]
+
+hooks_os = {
+  'win': [
+    {
+      # TODO(chrisha): Fix the GYP files so that they work without
+      # --no-circular-check.
+      "pattern": ".",
+      "action": ["python",
+                 "src/src/tools/gyp/gyp_main.py",
+                 "--no-circular-check",
+                 "src/src/client/windows/breakpad_client.gyp"],
+    },
+    {
+      # XXX: this and above should all be wired into build/all.gyp ?
+      "action": ["python",
+                 "src/src/tools/gyp/gyp_main.py",
+                 "--no-circular-check",
+                 "src/src/tools/windows/tools_windows.gyp"],
+    },
+  ],
+}
diff --git a/default.xml b/default.xml
index 6be9809b..6fba2d64 100644
--- a/default.xml
+++ b/default.xml
@@ -22,7 +22,7 @@
 
   <project path='src/src/tools/gyp'
            name='external/gyp/'
-           revision='e8ab0833a42691cd2184bd4c45d779e43821d3e0'
+           revision='324dd166b7c0b39d513026fa52d6280ac6d56770'
            remote='chromium' />
 
   <project path='src/src/testing'