From 403b90e0618e24f0c3d6ef9ade1969fc5e21fcff Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Fri, 3 May 2013 14:00:34 +0000 Subject: [PATCH] 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 | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) 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"', { -- 2.7.4