Update obvious deps.

This is a step toward targets declaring their deps in a sane fashion.
This change resolves cycles by forcing core to the root, then everything
in skia_lib pointing toward core as best possible, then everything
outside skia_lib depending on skia_lib for things in skia_lib. This
prevents double definitions where a symbol is provided by both the
skia_lib shared object and and a statically linked component of skia_lib.

R=djsollen@google.com

Review URL: https://codereview.chromium.org/19823003

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

15 files changed, 56 insertions, 66 deletions

diff --git a/gyp/animator.gyp b/gyp/animator.gyp
index a462ca4a23..f6d875c209 100644
--- a/gyp/animator.gyp
+++ b/gyp/animator.gyp
@@ -9,16 +9,13 @@
       'product_name': 'skia_animator',
       'type': 'static_library',
       'standalone_static_library': 1,
+      'dependencies': [
+        'skia_lib.gyp:skia_lib',
+        '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': [
diff --git a/gyp/effects.gyp b/gyp/effects.gyp
index d69c82035f..d0b8b4d774 100644
--- a/gyp/effects.gyp
+++ b/gyp/effects.gyp
@@ -6,15 +6,16 @@
       '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': {
diff --git a/gyp/gm.gyp b/gyp/gm.gyp
index 3fdfb8e647..6608aba5dc 100644
--- a/gyp/gm.gyp
+++ b/gyp/gm.gyp
@@ -8,7 +8,6 @@
       'target_name': 'gm_expectations',
       'type': 'static_library',
       'include_dirs' : [
-        '../include/core/',
         '../src/utils/',
       ],
       'sources': [
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index de0babde77..df82cdadd8 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -121,20 +121,19 @@
       'product_name': 'skia_skgpu',
       'type': 'static_library',
       'standalone_static_library': 1,
+      'dependencies': [
+        'angle.gyp:*',
+        'core.gyp:*',
+        'utils.gyp:*',
+      ],
       'includes': [
         'gpu.gypi',
       ],
       'include_dirs': [
-        '../include/config',
-        '../include/core',
-        '../include/utils',
-        '../src/core',
         '../include/gpu',
+        '../src/core',
         '../src/gpu',
       ],
-      'dependencies': [
-        'angle.gyp:*',
-      ],
       'export_dependent_settings': [
         'angle.gyp:*',
       ],
diff --git a/gyp/images.gyp b/gyp/images.gyp
index b2b404f000..76df7d178e 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -7,6 +7,7 @@
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
+        'core.gyp:*',
         'libjpeg.gyp:*',
         'libwebp.gyp:libwebp',
         'utils.gyp:utils',
@@ -15,8 +16,6 @@
         'libjpeg.gyp:*',
       ],
       'include_dirs': [
-        '../include/config',
-        '../include/core',
         '../include/images',
         '../include/lazy',
         # for access to SkErrorInternals.h
diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index bcc85a9bae..8aa5e0f6bd 100644
--- a/gyp/opts.gyp
+++ b/gyp/opts.gyp
@@ -23,9 +23,10 @@
       'product_name': 'skia_opts',
       'type': 'static_library',
       'standalone_static_library': 1,
+      'dependencies': [
+        'core.gyp:*',
+      ],
       'include_dirs': [
-        '../include/config',
-        '../include/core',
         '../src/core',
         '../src/opts',
       ],
@@ -111,9 +112,10 @@
       'product_name': 'skia_opts_ssse3',
       'type': 'static_library',
       'standalone_static_library': 1,
+      'dependencies': [
+        'core.gyp:*',
+      ],
       'include_dirs': [
-        '../include/config',
-        '../include/core',
         '../src/core',
       ],
       'conditions': [
@@ -146,9 +148,10 @@
       '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',
       ],
diff --git a/gyp/pdf.gyp b/gyp/pdf.gyp
index f89df933a4..1efb9848a9 100644
--- a/gyp/pdf.gyp
+++ b/gyp/pdf.gyp
@@ -10,9 +10,6 @@
         '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
diff --git a/gyp/ports.gyp b/gyp/ports.gyp
index 3fe833192a..fa717e14bb 100644
--- a/gyp/ports.gyp
+++ b/gyp/ports.gyp
@@ -6,9 +6,10 @@
       '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',
diff --git a/gyp/sfnt.gyp b/gyp/sfnt.gyp
index cc21b222bc..88ab94f831 100644
--- a/gyp/sfnt.gyp
+++ b/gyp/sfnt.gyp
@@ -5,9 +5,10 @@
       'product_name': 'skia_sfnt',
       'type': 'static_library',
       'standalone_static_library': 1,
+      'dependencies': [
+        'core.gyp:*',
+      ],
       'include_dirs': [
-        '../include/config',
-        '../include/core',
         '../src/sfnt',
       ],
       'sources': [
diff --git a/gyp/svg.gyp b/gyp/svg.gyp
index 3952fd7759..aed26a6fe9 100644
--- a/gyp/svg.gyp
+++ b/gyp/svg.gyp
@@ -5,11 +5,11 @@
       'product_name': 'skia_svg',
       'type': 'static_library',
       'standalone_static_library': 1,
+      'dependencies': [
+        'skia_lib.gyp:skia_lib',
+        'xml.gyp:*',
+      ],
       'include_dirs': [
-        '../include/config',
-        '../include/core',
-        '../include/xml',
-        '../include/utils',
         '../include/svg',
       ],
       'sources': [
diff --git a/gyp/utils.gyp b/gyp/utils.gyp
index 2ec5374bd7..68bf6b6b51 100644
--- a/gyp/utils.gyp
+++ b/gyp/utils.gyp
@@ -6,9 +6,10 @@
       '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',
diff --git a/gyp/views.gyp b/gyp/views.gyp
index 182bb34ee4..51ce0f0c45 100644
--- a/gyp/views.gyp
+++ b/gyp/views.gyp
@@ -11,19 +11,14 @@
       'product_name': 'skia_views',
       'type': 'static_library',
       'standalone_static_library': 1,
+      'dependencies': [
+        'skia_lib.gyp:skia_lib',
+        'angle.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',
diff --git a/gyp/views_animated.gyp b/gyp/views_animated.gyp
index 29e981d155..4bfcb28412 100644
--- a/gyp/views_animated.gyp
+++ b/gyp/views_animated.gyp
@@ -5,18 +5,16 @@
     {
       'target_name': 'views_animated',
       'type': 'static_library',
+      'dependencies': [
+        'skia_lib.gyp:skia_lib',
+        'angle.gyp:*',
+        'animator.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',
diff --git a/gyp/xml.gyp b/gyp/xml.gyp
index 2c4e06f8d1..7c06b448e3 100644
--- a/gyp/xml.gyp
+++ b/gyp/xml.gyp
@@ -5,11 +5,11 @@
       'product_name': 'skia_xml',
       'type': 'static_library',
       'standalone_static_library': 1,
+      'dependencies': [
+        'skia_lib.gyp:skia_lib',
+      ],
       'include_dirs': [
-        '../include/config',
-        '../include/core',
         '../include/xml',
-        '../include/utils',
       ],
       'sources': [
         '../include/xml/SkBML_WXMLParser.h',
diff --git a/gyp/zlib.gyp b/gyp/zlib.gyp
index fcd0ac3b40..89d4470b3f 100644
--- a/gyp/zlib.gyp
+++ b/gyp/zlib.gyp
@@ -3,9 +3,8 @@
     {
       'target_name': 'zlib',
       'type': 'static_library',
-      'include_dirs': [
-        '../include/config',
-        '../include/core',
+      'dependencies': [
+        'skia_lib.gyp:skia_lib',
       ],
       'sources': [
         '../include/core/SkFlate.h',