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/common_conditions.gypi b/gyp/common_conditions.gypi
index 9e8ce3f..53bfd2d 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -227,7 +227,7 @@
'conditions': [
[ 'skia_os != "chromeos"', {
'conditions': [
- [ 'skia_arch_width == 64 and skia_arch_type == "x86"', {
+ [ 'skia_arch_type == "x86_64"', {
'cflags': [
'-m64',
],
@@ -235,7 +235,7 @@
'-m64',
],
}],
- [ 'skia_arch_width == 32 and skia_arch_type == "x86"', {
+ [ 'skia_arch_type == "x86"', {
'cflags': [
'-m32',
],
@@ -628,7 +628,7 @@
'-fuse-ld=gold',
],
'conditions': [
- [ 'skia_arch_type == "x86"', {
+ [ '"x86" in skia_arch_type', {
'cflags': [
'-mssse3',
],