Enable the SSSE3 files to be built for Android when SSSE3 is not present.

include/core/SkPreConfig.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkPreConfig_DEFINED
@@ skipping 98 matching lines @@
  *  On non-intel CPU this should be undefined.
  */
 
 #define SK_CPU_SSE_LEVEL_SSE1     10
 #define SK_CPU_SSE_LEVEL_SSE2     20
 #define SK_CPU_SSE_LEVEL_SSE3     30
 #define SK_CPU_SSE_LEVEL_SSSE3    31
 
 // Are we in GCC?
 #ifndef SK_CPU_SSE_LEVEL
-    #if defined(__SSE2__)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE2
+    // These checks must be done in descending order to ensure we set the highest
+    // available SSE level.
+    #if defined(__SSSE3__)
+        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSSE3
     #elif defined(__SSE3__)
         #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE3
-    #elif defined(__SSSE3__)
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSSE3
+    #elif defined(__SSE2__)
+        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE2
     #endif
 #endif
 
 // Are we in VisualStudio?
 #ifndef SK_CPU_SSE_LEVEL
+    // These checks must be done in descending order to ensure we set the highest
+    // available SSE level.
     #if defined (_M_IX86_FP)
-        #if _M_IX86_FP == 1
+        #if _M_IX86_FP >= 2
+            #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE2
+        #elif _M_IX86_FP == 1
             #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE1
-        #elif _M_IX86_FP >= 2
-            #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE2
         #endif
     #endif
 #endif
 
-// 64bit intel guarantees at least SSE2
-#if defined(__x86_64__) || defined(_WIN64)
-    #if !defined(SK_CPU_SSE_LEVEL) || (SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSE2)
-        #undef SK_CPU_SSE_LEVEL
-        #define SK_CPU_SSE_LEVEL    SK_CPU_SSE_LEVEL_SSE2
-    #endif
-#endif
-
-// Android x86 NDK ABI requires SSE3 support
-#if defined(SK_BUILD_FOR_ANDROID)
-    #undef SK_CPU_SSE_LEVEL
-    #define SK_CPU_SSE_LEVEL        SK_CPU_SSE_LEVEL_SSE3
-#endif
-
 //////////////////////////////////////////////////////////////////////
 // ARM defines
 
 #if defined(__arm__) && (!defined(__APPLE__) || !TARGET_IPHONE_SIMULATOR)
     #define SK_CPU_ARM
 
     #if defined(__GNUC__)
         #if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
                 || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \
                 || defined(__ARM_ARCH_7EM__) || defined(_ARM_ARCH_7)
@@ skipping 79 matching lines @@
  *
  * NOTE: Clang/ARM (r161757) does not support the 'optimize' attribute.
  */
 #if SK_HAS_ATTRIBUTE(optimize)
 #   define SK_ATTRIBUTE_OPTIMIZE_O1 __attribute__((optimize("O1")))
 #else
 #   define SK_ATTRIBUTE_OPTIMIZE_O1 /* nothing */
 #endif
 
 #endif