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

Unified Diff: ui/gfx/gfx_tests.gyp

Issue 1110923003: Added switch to disable specified GL extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Also export GLApiBase Created 5 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 | « content/browser/gpu/gpu_process_host.cc ('k') | ui/gl/gl_api_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/gfx_tests.gyp
diff --git a/ui/gfx/gfx_tests.gyp b/ui/gfx/gfx_tests.gyp
index 10252c05d48e7f73dd3c6ff75b8c1506f06e6334..4d7c99bb8656b0afc8499bdf66f797903e428186 100644
--- a/ui/gfx/gfx_tests.gyp
+++ b/ui/gfx/gfx_tests.gyp
@@ -25,6 +25,9 @@
'text_elider_unittest.cc',
'text_utils_unittest.cc',
],
+ 'gl_test_sources' : [
+ '../gl/gl_api_unittest.cc',
danakj 2015/05/04 17:45:12 we shouldn't be including '../*' as sources in a g
+ ],
'all_sources': [
'<@(_common_sources)',
'animation/animation_container_unittest.cc',
@@ -92,7 +95,13 @@
['OS == "ios"', {
'sources': ['<@(_common_sources)'],
}, { # OS != "ios"
- 'sources': ['<@(_all_sources)'],
+ 'sources': [
+ '<@(_all_sources)',
+ '<@(_gl_test_sources)',
+ ],
+ 'dependencies': [
+ '../gl/gl.gyp:gl',
+ ],
}],
['OS != "mac" and OS != "ios"', {
'sources': [
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | ui/gl/gl_api_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698