Don't use m32 cflag for x86_64.

gyp/common_variables.gypi

 # Copyright 2012 The Android Open Source Project
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   # Get ready for the ugly...
   #
   # - We have to nest our variables dictionaries multiple levels deep, so that
   #   this and other gyp files can rely on previously-set variable values in
@@ skipping 64 matching lines @@
         [ 'skia_os == "win"', {
           'os_posix%': 0,
         }, {
           'os_posix%': 1,
         }],
         [ 'skia_os in ["linux"]', {
           'skia_poppler_enabled%': 1,
         }, {
           'skia_poppler_enabled%': 0,
         }],
-        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "mac"] or skia_arch_type == "arm64"', {
+        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "mac"] or "64" in skia_arch_type', {

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

So are we going to get "x86" and "x86_64"  as skia_arch_type consistently
through all the builds, or only for Android builds?  Am I thinking right that on
desktops we'll still see "x86" and skia_arch_width=64?  That seems pretty
confusing.

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

I would like it to be the case for all builds (although I have no control over
people who manually set their gyp defines... Do we ever do that on the bots?).
I think you are correct.

If we were consistent, this line could just say

['"64" in skia_arch_type',

If I understand this nesting process, that would mean we'd need to set the
default to x86_64 in the variables 3 dict above for these OSs.

Which means I'd need to add one deeper level which defines skia_os, and in level
3 do this check to switch to x86_64. Does that sound correct?

[scroggo, 2015/02/11 20:15:26]

And now of course I'm not sure of that. It appears that we already both set and
condtion on skia_os in level 2...

[scroggo, 2015/02/12 15:35:45]

I made that change in https://codereview.chromium.org/919003002, which builds on
this one. PTAL.

[scroggo, 2015/02/12 15:55:47]

Pulled in that change here. PTAL.

           'skia_arch_width%': 64,
         }, {
           'skia_arch_width%': 32,
         }],
         [ 'skia_os == "android"', {
           'skia_static_initializers%': 0,
           'skia_egl%': 1,
         }, {
           'skia_static_initializers%': 1,
         }],
@@ skipping 142 matching lines @@
     'skia_moz2d%': 0,
     'skia_is_bot%': '<!(python -c "import os; print os.environ.get(\'CHROME_HEADLESS\', 0)")',
     'skia_egl%': '<(skia_egl)',
 
     # These are referenced by our .gypi files that list files (e.g. core.gypi)
     #
     'skia_src_path%': '../src',
     'skia_include_path%': '../include',
   },
 }