Modify how gpu.gyp includes angle.gyp.

gyp/gpu.gyp

+# GYP for building gpu
 {
   'target_defaults': {
     'conditions': [
       ['skia_os != "win"', {
         'sources/': [ ['exclude', '_win.(h|cpp)$'],
         ],
       }],
       ['skia_os != "mac"', {
         'sources/': [ ['exclude', '_mac.(h|cpp|m|mm)$'],
         ],
@@ skipping 63 matching lines @@
       ],
     },
   },
   'targets': [
     {
       'target_name': 'skgpu',
       'product_name': 'skia_skgpu',
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
-        'angle.gyp:*',
         'core.gyp:*',
         'edtaa.gyp:*',
         'utils.gyp:*',
       ],
       'includes': [
         'gpu.gypi',
       ],
       'include_dirs': [
         '../include/gpu',
         '../src/core',
         '../src/gpu',
       ],
-      'export_dependent_settings': [
-        'angle.gyp:*',
-      ],
       'sources': [
         '<@(skgpu_sources)',
         '<@(skgpu_native_gl_sources)',
         '<@(skgpu_angle_gl_sources)',
         '<@(skgpu_mesa_gl_sources)',
         '<@(skgpu_debug_gl_sources)',
         '<@(skgpu_null_gl_sources)',
         'gpu.gypi', # Makes the gypi appear in IDEs (but does not modify the build).
       ],
       'conditions': [
@@ skipping 91 matching lines @@
           'include_dirs': [
              '/opt/X11/include/',
           ],
         }],
         [ 'skia_os in ["win", "ios"]', {
           'sources!': [
             '../src/gpu/gl/GrGLDefaultInterface_none.cpp',
             '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
           ],
         }],
-        [ 'not skia_angle', {
+        [ 'skia_angle', {
+          'dependencies': [
+            'angle.gyp:*',
+          ],
+          'export_dependent_settings': [
+            'angle.gyp:*',
+          ],
+        }, { # not skia_angle
           'sources!': [
             '<@(skgpu_angle_gl_sources)',
           ],
-          'dependencies!': [
-            'angle.gyp:*',
-          ],
-          'export_dependent_settings!': [
-            'angle.gyp:*',
-          ],
         }],
         [ 'skia_os == "android"', {
           'sources!': [
             '../src/gpu/gl/GrGLDefaultInterface_none.cpp',
             '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
           ],
           'link_settings': {
             'libraries': [
               '-lGLESv2',
               '-lEGL',
             ],
           },
         }],
       ],
     },
   ],
 }