diff options
| -rw-r--r-- | gyp/opts.gyp | 12 | ||||
| -rw-r--r-- | src/opts/opts_check_SSE2.cpp | 3 |
2 files changed, 5 insertions, 10 deletions
diff --git a/gyp/opts.gyp b/gyp/opts.gyp index 010ddfb028..12c4dc560c 100644 --- a/gyp/opts.gyp +++ b/gyp/opts.gyp @@ -33,20 +33,18 @@ 'conditions': [ [ 'skia_arch_type == "x86" and skia_os != "ios"', { 'conditions': [ - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]', { + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]', { 'cflags': [ '-msse2', ], }], - [ 'skia_os != "android"', { - 'dependencies': [ - 'opts_ssse3', - ], - }], ], 'include_dirs': [ '../include/utils', ], + 'dependencies': [ + 'opts_ssse3', + ], 'sources': [ '../src/opts/opts_check_SSE2.cpp', '../src/opts/SkBitmapProcState_opts_SSE2.cpp', @@ -119,7 +117,7 @@ '../src/core', ], 'conditions': [ - [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]', { + [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]', { 'cflags': [ '-mssse3', ], diff --git a/src/opts/opts_check_SSE2.cpp b/src/opts/opts_check_SSE2.cpp index 0bb450356d..9b6f775d9a 100644 --- a/src/opts/opts_check_SSE2.cpp +++ b/src/opts/opts_check_SSE2.cpp @@ -119,8 +119,6 @@ void SkBitmapProcState::platformConvolutionProcs() { void SkBitmapProcState::platformProcs() { if (cachedHasSSSE3()) { -#if !defined(SK_BUILD_FOR_ANDROID) - // Disable SSSE3 optimization for Android x86 if (fSampleProc32 == S32_opaque_D32_filter_DX) { fSampleProc32 = S32_opaque_D32_filter_DX_SSSE3; } else if (fSampleProc32 == S32_alpha_D32_filter_DX) { @@ -132,7 +130,6 @@ void SkBitmapProcState::platformProcs() { } else if (fSampleProc32 == S32_alpha_D32_filter_DXDY) { fSampleProc32 = S32_alpha_D32_filter_DXDY_SSSE3; } -#endif } else if (cachedHasSSE2()) { if (fSampleProc32 == S32_opaque_D32_filter_DX) { fSampleProc32 = S32_opaque_D32_filter_DX_SSE2; |