Update Crashpad to 8e37886d418dd042c3c7bfadac99214739ee4d98

third_party/crashpad/crashpad/build/gyp_crashpad.py

Index: third_party/crashpad/crashpad/build/gyp_crashpad.py
diff --git a/third_party/crashpad/crashpad/build/gyp_crashpad.py b/third_party/crashpad/crashpad/build/gyp_crashpad.py
index fe9da84021b1b970a1e30cb9f6bfddf497b79625..dd5fa69ca3bb187dfa85b363a174cfa35f400c8b 100755
--- a/third_party/crashpad/crashpad/build/gyp_crashpad.py
+++ b/third_party/crashpad/crashpad/build/gyp_crashpad.py
@@ -75,11 +75,24 @@ def main(args):
     return result
 
   if sys.platform == 'win32':
-    # Also generate the x86 build.
-    result = gyp.main(args + ['-D', 'target_arch=ia32', '-G', 'config=Debug'])
-    if result != 0:
-      return result
-    result = gyp.main(args + ['-D', 'target_arch=ia32', '-G', 'config=Release'])
+    # Check to make sure that no target_arch was specified. target_arch may be
+    # set during a cross build, such as a cross build for Android.
+    has_target_arch = False
+    for arg_index in xrange(0, len(args)):
+      arg = args[arg_index]
+      if (arg.startswith('-Dtarget_arch=') or
+          (arg == '-D' and arg_index + 1 < len(args) and
+           args[arg_index + 1].startswith('target_arch='))):
+        has_target_arch = True
+        break
+
+    if not has_target_arch:
+      # Also generate the x86 build.
+      result = gyp.main(args + ['-D', 'target_arch=ia32', '-G', 'config=Debug'])
+      if result != 0:
+        return result
+      result = gyp.main(
+          args + ['-D', 'target_arch=ia32', '-G', 'config=Release'])
 
   return result