prepare skia for shared library build on android

gyp/tests.gyp

 # GYP file to build unit tests.
 {
   'includes': [
     'apptype_console.gypi',
   ],
   'targets': [
     {
       'target_name': 'tests',
       'type': 'executable',
       'include_dirs' : [
@@ skipping 110 matching lines @@
         '../tests/UtilsTest.cpp',
         '../tests/WArrayTest.cpp',
         '../tests/WritePixelsTest.cpp',
         '../tests/Writer32Test.cpp',
         '../tests/XfermodeTest.cpp',
 
         # Needed for PipeTest.
         '../src/pipe/utils/SamplePipeControllers.cpp',
       ],
       'dependencies': [
-        'skia_base_libs.gyp:skia_base_libs',
-        'effects.gyp:effects',
+        'skia_lib.gyp:skia_lib',
         'flags.gyp:flags',
         'experimental.gyp:experimental',
-        'images.gyp:images',
         'pdf.gyp:pdf',
         'tools.gyp:picture_utils',
-        'utils.gyp:utils',
-        'sfnt.gyp:sfnt',
       ],
       'conditions': [
         [ 'skia_gpu == 1', {
           'include_dirs': [
             '../src/gpu',
           ],
         }],
         [ 'skia_os == "nacl"', {
           # CityHash is not supported on NaCl because the NaCl toolchain is
           # missing byteswap.h which is needed by CityHash.
           # TODO(borenet): Find a way to either provide this dependency or
           # replace it.
           'sources!': [
             '../tests/BitmapHasherTest.cpp',
             '../tests/ChecksumTest.cpp',
           ],
         }],
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: