Refactor SkMorphologyImageFilter, CPU and GPU paths. This required making opts/ dependent on effect…

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
     # target for those files to be compiled with -msse2.
     #
     # This is actually only a problem on 32-bit Linux (all Intel Macs have
     # SSE2, Linux x86_64 has SSE2 by definition, and MSC will happily emit
     # SSE2 from instrinsics, while generating plain ol' 386 for everything
     # else).  However, to keep the .gyp file simple and avoid platform-specific
     # build breakage, we do this on all platforms.
 
     # For about the same reason, we need to compile the ARM opts files
     # separately as well.
     {
       'target_name': 'opts',
       'product_name': 'skia_opts',
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
         'core.gyp:*',
+        'effects.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", "android"]', {
               'cflags': [
@@ skipping 76 matching lines @@
     # create another target specifically for SSSE3 code as we would not want
     # to compile the SSE2 code with -mssse3 which would potentially allow
     # gcc to generate SSSE3 code.
     {
       'target_name': 'opts_ssse3',
       'product_name': 'skia_opts_ssse3',
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
         'core.gyp:*',
+        'effects.gyp:*'
       ],
       'include_dirs': [
         '../src/core',
       ],
       'conditions': [
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]', {
           'cflags': [
             '-mssse3',
           ],
         }],
         # (Mac has -mssse3 globally.)
         [ 'skia_arch_type == "x86"', {
           'sources': [
             '../src/opts/SkBitmapProcState_opts_SSSE3.cpp',
           ],
         }],
       ],
     },
     # NEON code must be compiled with -mfpu=neon which also affects scalar
     # code. To support dynamic NEON code paths, we need to build all
     # NEON-specific sources in a separate static library. The situation
     # is very similar to the SSSE3 one.
     {
       'target_name': 'opts_neon',
       'product_name': 'skia_opts_neon',
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
         'core.gyp:*',
+        'effects.gyp:*'
       ],
       'include_dirs': [
         '../src/core',
         '../src/opts',
       ],
       'cflags!': [
         '-fno-omit-frame-pointer',
         '-mfpu=vfp',  # remove them all, just in case.
         '-mfpu=vfpv3',
         '-mfpu=vfpv3-d16',
@@ skipping 15 matching lines @@
         '../src/opts/SkBitmapProcState_matrix_repeat_neon.h',
         '../src/opts/SkBlitMask_opts_arm_neon.cpp',
         '../src/opts/SkBlitRow_opts_arm_neon.cpp',
         '../src/opts/SkBlurImage_opts_neon.cpp',
         '../src/opts/SkMorphology_opts_neon.cpp',
         '../src/opts/SkXfermode_opts_arm_neon.cpp',
       ],
     },
   ],
 }