diff options
| author | Mark Mentovai <mark@chromium.org> | 2017-09-27 16:43:35 -0400 |
|---|---|---|
| committer | Mark Mentovai <mark@chromium.org> | 2017-09-27 20:46:16 +0000 |
| commit | cbd7bb4cd2845b2ae56e1d3318ec879031378f32 (patch) | |
| tree | 0bb6c671e3c58bf6551ee70202c755ec185a7a6f | |
| parent | Fix MSVC build on 64-bit (diff) | |
| download | breakpad-cbd7bb4cd2845b2ae56e1d3318ec879031378f32.tar.xz | |
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>
| -rw-r--r-- | DEPS | 37 | ||||
| -rw-r--r-- | default.xml | 2 |
2 files changed, 22 insertions, 17 deletions
@@ -56,24 +56,29 @@ 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' |