Only run GYP for Windows targets on Windows
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>
diff --git a/DEPS b/DEPS
index db7f72d..a13a181 100644
--- a/DEPS
+++ b/DEPS
@@ -56,24 +56,29 @@
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 6be9809..6fba2d6 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'
