Don't use m32 cflag for x86_64.
When checking the skia_arch_type for "x86", instead of doing an
== compare, check if "x86" in skia_arch_type, so it will cover
both x86 and x86_64.
Except when we specifically want x86.
Set skia_arch_width based on "64" in skia_arch_type. No need to specify
in scripts.
In gyp_to_android.py, create a separate var_dict for x86_64.
BUG=skia:3419
Review URL: https://codereview.chromium.org/916113002
diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index 2fb1468..6ff9008 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,9 @@
[ '(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 ["x86", "x86_64", "arm", "mips", \
+ "arm64"])', {
'sources': [ '<@(none_sources)' ],
}],