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

Unified Diff: ui/gl/gl.gyp

Issue 681713002: Update from chromium https://crrev.com/301315 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years, 2 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 | « tools/valgrind/memcheck/suppressions.txt ('k') | ui/gl/gl_surface_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl.gyp
diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp
index f3be5b26472768cd3d54652f62aca66a5c075402..c404ee7136ae21026e4884208615414294340a7a 100644
--- a/ui/gl/gl.gyp
+++ b/ui/gl/gl.gyp
@@ -113,6 +113,7 @@
'gl_version_info.h',
'gpu_switching_manager.cc',
'gpu_switching_manager.h',
+ 'gpu_switching_observer.h',
'scoped_binders.cc',
'scoped_binders.h',
'scoped_make_current.cc',
@@ -311,6 +312,14 @@
'../android/ui_android.gyp:ui_java',
],
}],
+ ['ubsan==1', {
+ # Due to a bug in LLVM (http://llvm.org/bugs/show_bug.cgi?id=21349),
+ # compilation hangs for some GL source files. Disable -O2 temporarily
+ # until http://crbug.com/426271 is fixed.
+ 'cflags!': [
+ '-O2',
+ ],
+ }],
],
},
{
« no previous file with comments | « tools/valgrind/memcheck/suppressions.txt ('k') | ui/gl/gl_surface_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698