Don't use m32 cflag for x86_64.

gyp/opts.gyp

Index: gyp/opts.gyp
diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index 2fb1468f502ce8c05b1bb755033118d826c6b56d..c5698fdccd94e45f1765145ae08396fd3d3353c9 100644
--- a/gyp/opts.gyp
+++ b/gyp/opts.gyp
@@ -1,3 +1,4 @@
+# Gyp file for building opts target.
 {
   # Source lists live in opts.gypi.  This makes it easier to maintain our Chrome GYP/GN setup.
   # (To be honest, I'm not sure why we need to include common.gypi.  I thought it was automatic.)
@@ -26,7 +27,7 @@
         '../include/utils',
       ],
       'conditions': [
-        [ 'skia_arch_type == "x86" and skia_os != "ios"', {
+        [ '"x86" in skia_arch_type and skia_os != "ios"', {
           'cflags': [ '-msse2' ],
           'dependencies': [ 'opts_ssse3', 'opts_sse41' ],
           'sources': [ '<@(sse2_sources)' ],
@@ -44,7 +45,7 @@
 
         [ '(skia_arch_type == "arm" and arm_version < 7) \
             or (skia_os == "ios") \
-            or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips", "arm64"])', {
+            or (skia_os == "android" and skia_arch_type not in ["arm", "mips", "arm64"] and "x86" not in skia_arch_type)', {

[mtklein, 2015/02/11 18:15:05]

seems more straightforward to just write

["arm", "mips", "arm64", "x86", "x86_64"]

?

[scroggo, 2015/02/11 20:12:10]

That seems fine to me. Done.

           'sources': [ '<@(none_sources)' ],
         }],