diff options
author | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-22 14:39:45 +0000 |
---|---|---|
committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-22 14:39:45 +0000 |
commit | fe0c902e6a44be33c6c9ba18917f86767be01467 (patch) | |
tree | cfb014bcc5cf37e4befacb4f367c9913aad38642 | |
parent | 20afdb109ce35173e6fa97349448fc1133ffdbfc (diff) | |
download | gyp-fe0c902e6a44be33c6c9ba18917f86767be01467.tar.gz |
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/gyp@10231 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r-- | animator.gyp | 13 | ||||
-rw-r--r-- | effects.gyp | 9 | ||||
-rw-r--r-- | gm.gyp | 1 | ||||
-rw-r--r-- | gpu.gyp | 13 | ||||
-rw-r--r-- | images.gyp | 3 | ||||
-rw-r--r-- | opts.gyp | 15 | ||||
-rw-r--r-- | pdf.gyp | 3 | ||||
-rw-r--r-- | ports.gyp | 5 | ||||
-rw-r--r-- | sfnt.gyp | 5 | ||||
-rw-r--r-- | svg.gyp | 8 | ||||
-rw-r--r-- | utils.gyp | 5 | ||||
-rw-r--r-- | views.gyp | 15 | ||||
-rw-r--r-- | views_animated.gyp | 16 | ||||
-rw-r--r-- | xml.gyp | 6 | ||||
-rw-r--r-- | zlib.gyp | 5 |
15 files changed, 56 insertions, 66 deletions
diff --git a/animator.gyp b/animator.gyp index a462ca4..f6d875c 100644 --- a/animator.gyp +++ b/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/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': { @@ -8,7 +8,6 @@ 'target_name': 'gm_expectations', 'type': 'static_library', 'include_dirs' : [ - '../include/core/', '../src/utils/', ], 'sources': [ @@ -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:*', ], @@ -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 @@ -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', ], @@ -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 @@ -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', @@ -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': [ @@ -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': [ @@ -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', @@ -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/views_animated.gyp b/views_animated.gyp index 29e981d..4bfcb28 100644 --- a/views_animated.gyp +++ b/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', @@ -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', @@ -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', |