ui/gl/gl.gyp - Issue 723343002: Update from https://crrev.com/304121

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gl/gl.gyp

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ui/gl/gl.gyp

diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp

index cd0a8526aef30036d7bccfc4161cc782cd273859..cd33d7a0aeab81a600d8c36b587eb2f0081e3baa 100644

--- a/ui/gl/gl.gyp

+++ b/ui/gl/gl.gyp

@@ -263,6 +263,8 @@

'sources': [

'gl_context_cgl.cc',

'gl_context_cgl.h',

+ 'gl_fence_apple.cc',

+ 'gl_fence_apple.h',

'gl_image_io_surface.cc',

'gl_image_io_surface.h',

'scoped_cgl.cc',

@@ -310,14 +312,6 @@

'../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 | « ui/gl/generate_bindings.py ('k') | ui/gl/gl_bindings.h » ('j') | no next file with comments »