commit 403b90e0618e24f0c3d6ef9ade1969fc5e21fcff
author djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri May 03 14:00:34 2013 +0000
committer djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri May 03 14:00:34 2013 +0000
tree 09ced3f0376218e01ab746ac6f88f0bca69f157e
parent 6ba0b0f9ad566e57e641c57e1f0f4876f2197010

Exclude angle dependency on non-angle builds

R=bsalomon@google.com

Review URL: https://codereview.chromium.org/14200018

git-svn-id: http://skia.googlecode.com/svn/trunk@8983 2bbb7eff-a529-9590-31e7-b0007b416f81

gyp/gpu.gyp

diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 69e0815..efe757d 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -160,9 +160,13 @@
         }],
         [ 'not skia_angle', {
           'sources!': [
-            '../include/gpu/gl/SkANGLEGLContext.h',
-            '../src/gpu/gl/angle/SkANGLEGLContext.cpp',
-            '../src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp',
+            '<@(skgr_angle_gl_sources)',
+          ],
+          'dependencies!': [
+            'angle.gyp:*',
+          ],
+          'export_dependent_settings!': [
+            'angle.gyp:*',
           ],
         }],
       ],
@@ -289,10 +293,13 @@
         }],
         [ 'not skia_angle', {
           'sources!': [
-            '../include/gpu/gl/SkANGLEGLContext.h',
-
-            '../src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp',
-            '../src/gpu/gl/angle/SkANGLEGLContext.cpp',
+            '<@(gr_angle_gl_sources)',
+          ],
+          'dependencies!': [
+            'angle.gyp:*',
+          ],
+          'export_dependent_settings!': [
+            'angle.gyp:*',
           ],
         }],
         [ 'skia_os == "android"', {