From 88e3b6b0227192b0a8d0a5c106e689701f52f2be Mon Sep 17 00:00:00 2001
From: Mark Mentovai <mark@chromium.org>
Date: Tue, 1 Nov 2016 16:47:10 -0400
Subject: [PATCH] Omit platform-specific assembler source from builds as needed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The default filename rules do not match .S or .asm, so the
platform-specific assembler implementations of CaptureContext() were not
being affirmatively excluded from other platforms’ builds. This
previously worked without causing problems because the Mac build
environment didn’t know what to do with .asm files, and the Windows
build environment didn’t know what to do with .S files. Now that another
platform that may understand .S files is being added, the rules for when
to build these files must be tailored a bit more tightly.

BUG=crashpad:30

Change-Id: Ib62e619c007320d45279c104b3e229d92698aa72
Reviewed-on: https://chromium-review.googlesource.com/406348
Reviewed-by: Robert Sesek <rsesek@chromium.org>
---
 client/client.gyp | 5 +++++
 util/util.gyp     | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/client/client.gyp b/client/client.gyp
index 9892fb6c..45ae382a 100644
--- a/client/client.gyp
+++ b/client/client.gyp
@@ -61,6 +61,11 @@
             ],
           },
         }],
+        ['OS!="mac"', {
+          'sources!': [
+            'capture_context_mac.S',
+          ],
+        }],
       ],
       'direct_dependent_settings': {
         'include_dirs': [
diff --git a/util/util.gyp b/util/util.gyp
index 9321ab8d..8269bd42 100644
--- a/util/util.gyp
+++ b/util/util.gyp
@@ -284,6 +284,10 @@
               },
             }],
           ],
+        }, {  # else: OS!="win"
+          'sources!': [
+            'win/capture_context.asm',
+          ],
         }],
       ],
     },