Enable runtime checks for SSSE3 on x86 on Android.

gyp/opts.gyp

 {
   'targets': [
     # Due to an unfortunate intersection of lameness between gcc and gyp,
     # we have to build the *_SSE2.cpp files in a separate target.  The
     # gcc lameness is that, in order to compile SSE2 intrinsics code, it
     # must be passed the -msse2 flag.  However, with this flag, it may
     # emit SSE2 instructions even for scalar code, such as the CPUID
     # test used to test for the presence of SSE2.  So that, and all other
     # code must be compiled *without* -msse2.  The gyp lameness is that it
     # does not allow file-specific CFLAGS, so we must create this extra
@@ skipping 15 matching lines @@
       'dependencies': [
         'core.gyp:*',
       ],
       'include_dirs': [
         '../src/core',
         '../src/opts',
       ],
       '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',
             '../src/opts/SkBitmapFilter_opts_SSE2.cpp',
             '../src/opts/SkBlitRow_opts_SSE2.cpp',
             '../src/opts/SkBlitRect_opts_SSE2.cpp',
             '../src/opts/SkUtils_opts_SSE2.cpp',
           ],
         }],
         [ 'skia_arch_type == "arm" and armv7 == 1', {
@@ skipping 52 matching lines @@
       'product_name': 'skia_opts_ssse3',
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
         'core.gyp:*',
       ],
       'include_dirs': [
         '../src/core',
       ],
       'conditions': [
-        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]', {
+        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]', {
           'cflags': [
             '-mssse3',
           ],
         }],
         # TODO(epoger): the following will enable SSSE3 on Macs, but it will
         # break once we set OTHER_CFLAGS anywhere else (the first setting will
         # be replaced, not added to)
         [ 'skia_os in ["mac"]', {
           'xcode_settings': {
             'OTHER_CFLAGS': ['-mssse3',],
@@ skipping 47 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: