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
diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index bcc85a9..8aa5e0f 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',
],