ui/gl/gl.gyp - Issue 23868030: Make it possible to use OSMesa on Android

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 23868030: Make it possible to use OSMesa on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 10 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:

Index: ui/gl/gl.gyp

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

index 702f4ccabd4e2942010ce61b18a32734c29eb6ff..527c5c4b63d20cb9a068d849b27ed26cc1661f63 100644

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

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

@@ -84,8 +84,6 @@

'gl_implementation.cc',

'gl_implementation.h',

'gl_implementation_android.cc',

- 'gl_implementation_linux.cc',

- 'gl_implementation_linux.h',

'gl_implementation_ozone.cc',

'gl_implementation_mac.cc',

'gl_implementation_win.cc',

@@ -187,6 +185,12 @@

'<(DEPTH)/third_party/khronos',

}],

+ ['OS in ("android", "linux")', {

+ 'sources': [

+ 'gl_implementation_osmesa.cc',

+ 'gl_implementation_osmesa.h',

+ ],

+ }],

['use_x11 == 1', {

'sources': [

'gl_context_glx.cc',

@@ -277,7 +281,6 @@

'sources!': [

- 'gl_context_osmesa.cc',

'system_monitor_posix.cc',

'defines': [

« no previous file with comments | « third_party/mesa/mesa.gyp ('k') | ui/gl/gl_context_android.cc » ('j') | no next file with comments »