prepare skia for shared library build on android

gyp/tools.gyp

 # GYP file to build various tools.
 #
 # To build on Linux:
 #  ./gyp_skia tools.gyp && make tools
 #
 {
   'includes': [
     'apptype_console.gypi',
   ],
   'targets': [
@@ skipping 19 matching lines @@
       'sources': [
         '../tools/skdiff.cpp',
         '../tools/skdiff.h',
         '../tools/skdiff_html.cpp',
         '../tools/skdiff_html.h',
         '../tools/skdiff_main.cpp',
         '../tools/skdiff_utils.cpp',
         '../tools/skdiff_utils.h',
       ],
       'dependencies': [
-        'skia_base_libs.gyp:skia_base_libs',
-        'effects.gyp:effects',
-        'images.gyp:images',
+        'skia_lib.gyp:skia_lib',
       ],
     },
     {
       'target_name': 'skimagediff',
       'type': 'executable',
       'sources': [
         '../tools/skdiff.cpp',
         '../tools/skdiff.h',
         '../tools/skdiff_html.cpp',
         '../tools/skdiff_html.h',
         '../tools/skdiff_image.cpp',
         '../tools/skdiff_utils.cpp',
         '../tools/skdiff_utils.h',
       ],
       'dependencies': [
-        'skia_base_libs.gyp:skia_base_libs',
-        'effects.gyp:effects',
-        'images.gyp:images',
+        'skia_lib.gyp:skia_lib',
       ],
     },
     {
       'target_name': 'skhello',
       'type': 'executable',
       'sources': [
         '../tools/skhello.cpp',
         '../src/image/SkImage_Codec.cpp',
       ],
       'dependencies': [
-        'skia_base_libs.gyp:skia_base_libs',
-        'effects.gyp:effects',
+        'skia_lib.gyp:skia_lib',
         'flags.gyp:flags',
-        'images.gyp:images',
       ],
     },
     {
       'target_name': 'skimage',
       'type': 'executable',
       'sources': [
         '../tools/skimage_main.cpp',
       ],
       'include_dirs': [
         # For SkBitmapHasher.h
         '../src/utils/',
       ],
       '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',
         'utils.gyp:utils',
       ],
     },
     {
       'target_name': 'lua_pictures',
       'type': 'executable',
       'sources': [
         '../tools/lua/lua_pictures.cpp',
         '../src/utils/SkLuaCanvas.cpp',
         '../src/utils/SkLua.cpp',
       ],
       'dependencies': [
-        'skia_base_libs.gyp:skia_base_libs',
+        'skia_lib.gyp:skia_lib',
         'effects.gyp:effects',
         'utils.gyp:utils',
         'images.gyp:images',
         'tools.gyp:picture_renderer',
         'tools.gyp:picture_utils',
         'ports.gyp:ports',
         'flags.gyp:flags',
         'lua.gyp:lua',
       ],
     },
     {
       'target_name': 'render_pictures',
       'type': 'executable',
       'sources': [
         '../tools/render_pictures_main.cpp',
       ],
       'include_dirs': [
         '../src/pipe/utils/',
       ],
       'dependencies': [
-        'skia_base_libs.gyp:skia_base_libs',
+        'skia_lib.gyp:skia_lib',
         'tools.gyp:picture_renderer',
         'tools.gyp:picture_utils',
-        'ports.gyp:ports',
         'flags.gyp:flags',
       ],
     },
     {
       'target_name': 'bench_pictures',
       'type': 'executable',
       'sources': [
         '../bench/SkBenchLogger.h',
         '../bench/SkBenchLogger.cpp',
         '../bench/TimerData.h',
         '../bench/TimerData.cpp',
         '../tools/bench_pictures_main.cpp',
         '../tools/PictureBenchmark.cpp',
       ],
       'include_dirs': [
         '../bench',
         '../src/lazy/',
       ],
       'dependencies': [
-        'skia_base_libs.gyp:skia_base_libs',
-        'effects.gyp:effects',
+        'skia_lib.gyp:skia_lib',
         'tools.gyp:picture_utils',
         'tools.gyp:picture_renderer',
         'bench.gyp:bench_timer',
-        'ports.gyp:ports',
         'flags.gyp:flags',
       ],
     },
     {
       'target_name': 'picture_renderer',
       'type': 'static_library',
       'sources': [
         '../tools/PictureRenderer.h',
         '../tools/PictureRenderer.cpp',
         '../tools/PictureRenderingFlags.h',
         '../tools/PictureRenderingFlags.cpp',
         '../tools/CopyTilesRenderer.h',
         '../tools/CopyTilesRenderer.cpp',
         '../src/pipe/utils/SamplePipeControllers.h',
         '../src/pipe/utils/SamplePipeControllers.cpp',
       ],
       'include_dirs': [
         '../src/core/',
         '../src/pipe/utils/',
         '../src/utils/',
       ],
       'dependencies': [
-        'skia_base_libs.gyp:skia_base_libs',
-        'effects.gyp:effects',
-        'images.gyp:images',
+        'skia_lib.gyp:skia_lib',
         'tools.gyp:picture_utils',
         'flags.gyp:flags',
       ],
       'conditions': [
         ['skia_gpu == 1',
           {
             'include_dirs' : [
               '../src/gpu',
             ],
           },
         ],
       ],
-      'export_dependent_settings': [
-        'images.gyp:images',
-      ],
     },
     {
       'target_name': 'render_pdfs',
       'type': 'executable',
       'sources': [
         '../tools/render_pdfs_main.cpp',
         '../tools/PdfRenderer.cpp',
         '../tools/PdfRenderer.h',
       ],
       'include_dirs': [
         '../src/pipe/utils/',
         '../src/utils/',
       ],
       'dependencies': [
-        'core.gyp:core',
-        'effects.gyp:effects',
-        'images.gyp:images',
+        'skia_lib.gyp:skia_lib',
         'pdf.gyp:pdf',
-        'ports.gyp:ports',
         'tools.gyp:picture_utils',
       ],
       'conditions': [
         ['skia_win_debuggers_path and skia_os == "win"',
           {
             'dependencies': [
               'tools.gyp:win_dbghelp',
             ],
           },
         ],
@@ skipping 26 matching lines @@
       ],
     },
     {
       'target_name': 'picture_utils',
       'type': 'static_library',
       'sources': [
         '../tools/picture_utils.cpp',
         '../tools/picture_utils.h',
       ],
       'dependencies': [
-        'skia_base_libs.gyp:skia_base_libs',
+        'skia_lib.gyp:skia_lib',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
         '../tools/',
         ],
       },
     },
     {
       'target_name': 'pinspect',
       'type': 'executable',
       'sources': [
         '../tools/pinspect.cpp',
       ],
       'dependencies': [
-        'skia_base_libs.gyp:skia_base_libs',
-        'effects.gyp:effects',
-        'images.gyp:images',
+        'skia_lib.gyp:skia_lib',
       ],
     },
     {
       'target_name': 'filter',
       'type': 'executable',
       'include_dirs' : [
         '../src/core',
         '../debugger',
       ],
       'sources': [
         '../tools/filtermain.cpp',
         '../tools/path_utils.h',
         '../tools/path_utils.cpp',
         '../debugger/SkDrawCommand.h',
         '../debugger/SkDrawCommand.cpp',
         '../debugger/SkDebugCanvas.h',
         '../debugger/SkDebugCanvas.cpp',
         '../debugger/SkObjectParser.h',
         '../debugger/SkObjectParser.cpp',
       ],
       'dependencies': [
-        'skia_base_libs.gyp:skia_base_libs',
-        'effects.gyp:effects',
-        'images.gyp:images',
+        'skia_lib.gyp:skia_lib',
         'tools.gyp:picture_utils',
       ],
     },
   ],
   'conditions': [
     ['skia_win_debuggers_path and skia_os == "win"',
       {
         'targets': [
           {
             'target_name': 'win_dbghelp',
@@ skipping 23 matching lines @@
       },
     ],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: