Revert deps changes in r10220 and r10217.

Need to avoid linking in .a things which are already provided by .so things.


git-svn-id: http://skia.googlecode.com/svn/trunk@10222 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index df82cda..de0babd 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -121,19 +121,20 @@
       'product_name': 'skia_skgpu',
       'type': 'static_library',
       'standalone_static_library': 1,
-      'dependencies': [
-        'angle.gyp:*',
-        'core.gyp:*',
-        'utils.gyp:*',
-      ],
       'includes': [
         'gpu.gypi',
       ],
       'include_dirs': [
-        '../include/gpu',
+        '../include/config',
+        '../include/core',
+        '../include/utils',
         '../src/core',
+        '../include/gpu',
         '../src/gpu',
       ],
+      'dependencies': [
+        'angle.gyp:*',
+      ],
       'export_dependent_settings': [
         'angle.gyp:*',
       ],