Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Unified Diff: gyp/gpu.gyp

Issue 14200018: Exclude angle dependency on non-angle builds (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: fix typo #2 Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/gpu.gyp
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 69e0815c69de8eb84aa9db34d1d7750daf60b9ce..efe757de0acddacbb1b2a00a26cf620d76d2ba19 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"', {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698