Modify how gpu.gyp includes angle.gyp.

gyp/gpu.gyp

Index: gyp/gpu.gyp
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 77cbf2e256a5f8299581fb3ea2e6dacce78541cd..471004cbe443fd588ede184cf7d0960e30e091dc 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -1,3 +1,4 @@
+# GYP for building gpu
 {
   'target_defaults': {
     'conditions': [
@@ -81,7 +82,6 @@
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
-        'angle.gyp:*',
         'core.gyp:*',
         'edtaa.gyp:*',
         'utils.gyp:*',
@@ -94,9 +94,6 @@
         '../src/core',
         '../src/gpu',
       ],
-      'export_dependent_settings': [
-        'angle.gyp:*',
-      ],
       'sources': [
         '<@(skgpu_sources)',
         '<@(skgpu_native_gl_sources)',
@@ -208,16 +205,17 @@
             '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
           ],
         }],
-        [ 'not skia_angle', {
-          'sources!': [
-            '<@(skgpu_angle_gl_sources)',
-          ],
-          'dependencies!': [
+        [ 'skia_angle', {
+          'dependencies': [
             'angle.gyp:*',
           ],
-          'export_dependent_settings!': [
+          'export_dependent_settings': [
             'angle.gyp:*',
           ],
+        }, { # not skia_angle
+          'sources!': [
+            '<@(skgpu_angle_gl_sources)',
+          ],
         }],
         [ 'skia_os == "android"', {
           'sources!': [