Stop adding mssse3 & m32/m64 for Android framework.
BUG=skia:3423
Review URL: https://codereview.chromium.org/920703005
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 53bfd2d..676ec08 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -227,7 +227,7 @@
'conditions': [
[ 'skia_os != "chromeos"', {
'conditions': [
- [ 'skia_arch_type == "x86_64"', {
+ [ 'skia_arch_type == "x86_64" and not skia_android_framework', {
'cflags': [
'-m64',
],
@@ -235,7 +235,7 @@
'-m64',
],
}],
- [ 'skia_arch_type == "x86"', {
+ [ 'skia_arch_type == "x86" and not skia_android_framework', {
'cflags': [
'-m32',
],
@@ -636,6 +636,7 @@
[ 'skia_android_framework', {
'cflags!': [
'-fuse-ld=gold',
+ '-mssse3',
],
}],
[ 'skia_shared_lib', {