diff options
| author |  scroggo <scroggo@google.com> | 2015-02-12 13:27:40 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-12 13:27:40 -0800 |
| commit | 7cd3f64385ab161a69c39be41fd1827e49da3170 (patch) | |
| tree | 986ba92a413e4c7755ea88616feb08831c028b6d | |
| parent | 979e0eacbd59327654d0c8d4216d6732413ef2a0 (diff) | |
Stop adding mssse3 & m32/m64 for Android framework.
BUG=skia:3423
Review URL: https://codereview.chromium.org/920703005
| -rw-r--r-- | gyp/common_conditions.gypi | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 53bfd2d931..676ec0897a 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', { |