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 opts, ports, and utils depending on core, then everything else.
We will need some other change to resolve the fact that
core, opts, ports, and utils depend on each other and other targets which
depend on them. Outside of these targets, things look ok.
R=djsollen@google.com
Review URL: https://codereview.chromium.org/19823003
git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10217 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/animator.gyp b/animator.gyp
index a462ca4..609d52e 100644
--- a/animator.gyp
+++ b/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': [
diff --git a/effects.gyp b/effects.gyp
index d69c820..d0b8b4d 100644
--- a/effects.gyp
+++ b/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/gpu.gyp b/gpu.gyp
index de0babd..df82cda 100644
--- a/gpu.gyp
+++ b/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/images.gyp b/images.gyp
index b2b404f..76df7d1 100644
--- a/images.gyp
+++ b/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/opts.gyp b/opts.gyp
index bcc85a9..8aa5e0f 100644
--- a/opts.gyp
+++ b/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/pdf.gyp b/pdf.gyp
index f89df93..1efb984 100644
--- a/pdf.gyp
+++ b/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/ports.gyp b/ports.gyp
index 0e57985..1c7c33e 100644
--- a/ports.gyp
+++ b/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/sfnt.gyp b/sfnt.gyp
index cc21b22..88ab94f 100644
--- a/sfnt.gyp
+++ b/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/svg.gyp b/svg.gyp
index 3952fd7..c161ef5 100644
--- a/svg.gyp
+++ b/svg.gyp
@@ -5,11 +5,12 @@
'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': [
diff --git a/utils.gyp b/utils.gyp
index 2ec5374..68bf6b6 100644
--- a/utils.gyp
+++ b/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/views.gyp b/views.gyp
index 182bb34..2957fed 100644
--- a/views.gyp
+++ b/views.gyp
@@ -11,19 +11,17 @@
'product_name': 'skia_views',
'type': 'static_library',
'standalone_static_library': 1,
- 'include_dirs': [
- '../include/config',
- '../include/core',
- '../include/effects',
- '../include/images',
- '../include/lazy',
- '../include/utils',
- '../include/views',
- '../include/views/unix',
- '../include/xml',
- ],
'dependencies': [
'angle.gyp:*',
+ 'core.gyp:*',
+ 'effects.gyp:*',
+ 'images.gyp:*',
+ 'utils.gyp:*',
+ 'xml.gyp:*',
+ ],
+ 'include_dirs': [
+ '../include/views',
+ '../include/views/unix',
],
'sources': [
'../include/views/SkApplication.h',
diff --git a/views_animated.gyp b/views_animated.gyp
index 29e981d..29488b7 100644
--- a/views_animated.gyp
+++ b/views_animated.gyp
@@ -5,18 +5,19 @@
{
'target_name': 'views_animated',
'type': 'static_library',
+ 'dependencies': [
+ 'angle.gyp:*',
+ 'animator.gyp:*',
+ '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',
diff --git a/xml.gyp b/xml.gyp
index 2c4e06f..e75dd4c 100644
--- a/xml.gyp
+++ b/xml.gyp
@@ -5,11 +5,12 @@
'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',
diff --git a/zlib.gyp b/zlib.gyp
index fcd0ac3..1423c04 100644
--- a/zlib.gyp
+++ b/zlib.gyp
@@ -3,9 +3,8 @@
{
'target_name': 'zlib',
'type': 'static_library',
- 'include_dirs': [
- '../include/config',
- '../include/core',
+ 'dependencies': [
+ 'core.gyp:*',
],
'sources': [
'../include/core/SkFlate.h',
