prepare skia for shared library build on android

gyp/tools.gyp

Index: gyp/tools.gyp
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index 7e0a03b63bd1513f5076063518cd89131a4a87e5..80c624d5b802f078386bea7b290299dcdd92a06e 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -37,9 +37,7 @@
         '../tools/skdiff_utils.h',
       ],
       'dependencies': [
-        'skia_base_libs.gyp:skia_base_libs',
-        'effects.gyp:effects',
-        'images.gyp:images',
+        'skia_lib.gyp:skia_lib',
       ],
     },
     {
@@ -55,9 +53,7 @@
         '../tools/skdiff_utils.h',
       ],
       'dependencies': [
-        'skia_base_libs.gyp:skia_base_libs',
-        'effects.gyp:effects',
-        'images.gyp:images',
+        'skia_lib.gyp:skia_lib',
       ],
     },
     {
@@ -68,10 +64,8 @@
         '../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',
       ],
     },
     {
@@ -85,11 +79,9 @@
         '../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',
       ],
@@ -103,7 +95,7 @@
         '../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',
@@ -124,10 +116,9 @@
         '../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',
       ],
     },
@@ -147,12 +138,10 @@
         '../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',
       ],
     },
@@ -175,9 +164,7 @@
         '../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',
       ],
@@ -190,9 +177,6 @@
           },
         ],
       ],
-      'export_dependent_settings': [
-        'images.gyp:images',
-      ],
     },
     {
       'target_name': 'render_pdfs',
@@ -207,11 +191,8 @@
         '../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': [
@@ -258,7 +239,7 @@
         '../tools/picture_utils.h',
       ],
       'dependencies': [
-        'skia_base_libs.gyp:skia_base_libs',
+        'skia_lib.gyp:skia_lib',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
@@ -273,9 +254,7 @@
         '../tools/pinspect.cpp',
       ],
       'dependencies': [
-        'skia_base_libs.gyp:skia_base_libs',
-        'effects.gyp:effects',
-        'images.gyp:images',
+        'skia_lib.gyp:skia_lib',
       ],
     },
     {
@@ -297,9 +276,7 @@
         '../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',
       ],
     },