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', |
+ ], |
+ }], |
], |
}, |
{ |