commit 7cd3f64385ab161a69c39be41fd1827e49da3170
author scroggo <scroggo@google.com> Thu Feb 12 13:27:40 2015 -0800
committer Commit bot <commit-bot@chromium.org> Thu Feb 12 13:27:40 2015 -0800
tree 986ba92a413e4c7755ea88616feb08831c028b6d
parent 979e0eacbd59327654d0c8d4216d6732413ef2a0

Stop adding mssse3 & m32/m64 for Android framework.

BUG=skia:3423

Review URL: https://codereview.chromium.org/920703005

gyp/common_conditions.gypi

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', {