prepare skia for shared library build on android

gyp/gm.gyp

 # GYP file to build the "gm" (golden master) executable.
 {
   'includes': [
     'apptype_console.gypi',
   ],
   'targets': [
     {
       'target_name': 'gm_expectations',
       'type': 'static_library',
       'include_dirs' : [
         '../include/core/',
         '../src/utils/',
       ],
       'sources': [
         '../gm/gm_expectations.h',
         '../gm/gm_expectations.cpp',
       ],
       'dependencies': [
-        'skia_base_libs.gyp:skia_base_libs',
+        'skia_lib.gyp:skia_lib',
         'core.gyp:core',
         'images.gyp:images',
         'jsoncpp.gyp:jsoncpp',
         'utils.gyp:utils',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../gm/',
         ],
       },
@@ skipping 20 matching lines @@
         '../debugger/SkObjectParser.cpp',
 
         '../gm/gm.cpp',
         '../gm/gmmain.cpp',
         '../gm/system_preferences_default.cpp',
 
         '../src/pipe/utils/SamplePipeControllers.h',
         '../src/pipe/utils/SamplePipeControllers.cpp',
       ],
       'dependencies': [
-        'skia_base_libs.gyp:skia_base_libs',
-        'effects.gyp:effects',
+        'skia_lib.gyp:skia_lib',
         'flags.gyp:flags',
         'gm.gyp:gm_expectations',
-        'images.gyp:images',
         'jsoncpp.gyp:jsoncpp',
         'pdf.gyp:pdf',
-        'utils.gyp:utils',
       ],
       'conditions': [
         ['skia_os == "mac"', {
           'sources!': [
             '../gm/system_preferences_default.cpp',
           ],
           'sources': [
             '../gm/system_preferences_mac.mm',
           ],
           'link_settings': {
@@ skipping 16 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: