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 | b8f3655d492fc602c252f6fcc9aba3d37d8d59f4 (patch) | |
| tree | 40cb07d68cabded3938c0cb1e6ae65658d262ebe /gyp/xml.gyp | |
| parent | 489ba1dac0002273b0d353fd5dea221ce5365071 (diff) | |
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
Diffstat (limited to 'gyp/xml.gyp')
| -rw-r--r-- | gyp/xml.gyp | 6 |
1 files changed, 3 insertions, 3 deletions
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', |