Revert deps changes in r10220 and r10217.

Need to avoid linking in .a things which are already provided by .so things.


git-svn-id: http://skia.googlecode.com/svn/trunk@10222 2bbb7eff-a529-9590-31e7-b0007b416f81

gyp/animator.gyp

@@ -9,16 +9,16 @@
       'product_name': 'skia_animator',
       'type': 'static_library',
       'standalone_static_library': 1,
-      'dependencies': [
-        'core.gyp:*',
-        'effects.gyp:*',
-        'images.gyp:*',
-        'utils.gyp:*',
-        'views.gyp:*',
-        'xml.gyp:*',
-      ],
       'include_dirs': [
         '../include/animator',
+        '../include/config',
+        '../include/core',
+        '../include/effects',
+        '../include/images',
+        '../include/lazy',
+        '../include/utils',
+        '../include/views',
+        '../include/xml',
         '../src/utils',
       ],
       'sources': [

gyp/effects.gyp

@@ -6,16 +6,15 @@
       'product_name': 'skia_effects',
       'type': 'static_library',
       'standalone_static_library': 1,
-      'dependencies': [
-        'core.gyp:*',
-        'images.gyp:*',
-        'utils.gyp:*',
-      ],
       'includes': [
         'effects.gypi',
       ],
       'include_dirs': [
+        '../include/config',
+        '../include/core',
         '../include/effects',
+        '../include/lazy',
+        '../include/utils',
         '../src/core',
       ],
       'direct_dependent_settings': {

gyp/gpu.gyp

@@ -121,19 +121,20 @@
       'product_name': 'skia_skgpu',
       'type': 'static_library',
       'standalone_static_library': 1,
-      'dependencies': [
-        'angle.gyp:*',
-        'core.gyp:*',
-        'utils.gyp:*',
-      ],
       'includes': [
         'gpu.gypi',
       ],
       'include_dirs': [
-        '../include/gpu',
+        '../include/config',
+        '../include/core',
+        '../include/utils',
         '../src/core',
+        '../include/gpu',
         '../src/gpu',
       ],
+      'dependencies': [
+        'angle.gyp:*',
+      ],
       'export_dependent_settings': [
         'angle.gyp:*',
       ],

gyp/images.gyp

@@ -7,7 +7,6 @@
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
-        'core.gyp:*',
         'libjpeg.gyp:*',
         'libwebp.gyp:libwebp',
         'utils.gyp:utils',
@@ -16,6 +15,8 @@
         'libjpeg.gyp:*',
       ],
       'include_dirs': [
+        '../include/config',
+        '../include/core',
         '../include/images',
         '../include/lazy',
         # for access to SkErrorInternals.h

gyp/opts.gyp

@@ -23,10 +23,9 @@
       'product_name': 'skia_opts',
       'type': 'static_library',
       'standalone_static_library': 1,
-      'dependencies': [
-        'core.gyp:*',
-      ],
       'include_dirs': [
+        '../include/config',
+        '../include/core',
         '../src/core',
         '../src/opts',
       ],
@@ -112,10 +111,9 @@
       'product_name': 'skia_opts_ssse3',
       'type': 'static_library',
       'standalone_static_library': 1,
-      'dependencies': [
-        'core.gyp:*',
-      ],
       'include_dirs': [
+        '../include/config',
+        '../include/core',
         '../src/core',
       ],
       'conditions': [
@@ -148,10 +146,9 @@
       'product_name': 'skia_opts_neon',
       'type': 'static_library',
       'standalone_static_library': 1,
-      'dependencies': [
-        'core.gyp:*',
-      ],
       'include_dirs': [
+        '../include/config',
+        '../include/core',
         '../src/core',
         '../src/opts',
       ],

gyp/pdf.gyp

@@ -10,6 +10,9 @@
         'zlib.gyp:zlib',
       ],
       'include_dirs': [
+        '../include/config',
+        '../include/core',
+        '../include/images',
         '../include/pdf',
         '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h
         '../src/utils', # needed to get SkBitSet.h

gyp/ports.gyp

@@ -6,10 +6,9 @@
       'product_name': 'skia_ports',
       'type': 'static_library',
       'standalone_static_library': 1,
-      'dependencies': [
-        'core.gyp:*',
-      ],
       'include_dirs': [
+        '../include/config',
+        '../include/core',
         '../include/effects',
         '../include/images',
         '../include/ports',

gyp/sfnt.gyp

@@ -5,10 +5,9 @@
       'product_name': 'skia_sfnt',
       'type': 'static_library',
       'standalone_static_library': 1,
-      'dependencies': [
-        'core.gyp:*',
-      ],
       'include_dirs': [
+        '../include/config',
+        '../include/core',
         '../src/sfnt',
       ],
       'sources': [

gyp/svg.gyp

@@ -5,12 +5,11 @@
       'product_name': 'skia_svg',
       'type': 'static_library',
       'standalone_static_library': 1,
-      'dependencies': [
-        'core.gyp:*',
-        'utils.gyp:*',
-        'xml.gyp:*',
-      ],
       'include_dirs': [
+        '../include/config',
+        '../include/core',
+        '../include/xml',
+        '../include/utils',
         '../include/svg',
       ],
       'sources': [

gyp/utils.gyp

@@ -6,10 +6,9 @@
       'product_name': 'skia_utils',
       'type': 'static_library',
       'standalone_static_library': 1,
-      'dependencies': [
-        'core.gyp:*',
-      ],
       'include_dirs': [
+        '../include/config',
+        '../include/core',
         '../include/effects',
         '../include/images',
         '../include/lazy',

gyp/views.gyp

@@ -11,17 +11,19 @@
       'product_name': 'skia_views',
       'type': 'static_library',
       'standalone_static_library': 1,
-      'dependencies': [
-        'angle.gyp:*',
-        'core.gyp:*',
-        'effects.gyp:*',
-        'images.gyp:*',
-        'utils.gyp:*',
-        'xml.gyp:*',
-      ],
       'include_dirs': [
+        '../include/config',
+        '../include/core',
+        '../include/effects',
+        '../include/images',
+        '../include/lazy',
+        '../include/utils',
         '../include/views',
         '../include/views/unix',
+        '../include/xml',
+      ],
+      'dependencies': [
+        'angle.gyp:*',
       ],
       'sources': [
         '../include/views/SkApplication.h',

gyp/views_animated.gyp

@@ -5,21 +5,18 @@
     {
       'target_name': 'views_animated',
       'type': 'static_library',
-      'dependencies': [
-        'angle.gyp:*',
-        #'animator.gyp:*', #commented out until Android is fixed
-        'core.gyp:*',
-        'effects.gyp:*',
-        'images.gyp:*',
-        'utils.gyp:*',
-        'views.gyp:*',
-        'xml.gyp:*',
-      ],
       'include_dirs': [
         '../include/animator',
-
+        '../include/config',
+        '../include/core',
+        '../include/effects',
+        '../include/images',
+        '../include/lazy',
+        '../include/utils',
+        '../include/views',
         '../include/views/animated',
         '../include/views/unix',
+        '../include/xml',
       ],
       'sources': [
         '../include/views/animated/SkBorderView.h',

gyp/xml.gyp

@@ -5,12 +5,11 @@
       'product_name': 'skia_xml',
       'type': 'static_library',
       'standalone_static_library': 1,
-      'dependencies': [
-        'core.gyp:*',
-        'utils.gyp:*',
-      ],
       'include_dirs': [
+        '../include/config',
+        '../include/core',
         '../include/xml',
+        '../include/utils',
       ],
       'sources': [
         '../include/xml/SkBML_WXMLParser.h',

gyp/zlib.gyp

@@ -3,8 +3,9 @@
     {
       'target_name': 'zlib',
       'type': 'static_library',
-      'dependencies': [
-        'core.gyp:*',
+      'include_dirs': [
+        '../include/config',
+        '../include/core',
       ],
       'sources': [
         '../include/core/SkFlate.h',