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/gpu.gyp b/gyp/gpu.gyp
index de0babd..df82cda 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:*',
],