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

Unified Diff: ui/gfx/gl/gl.gyp

Issue 8588059: Upstream: GL implementation on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address the comments Created 9 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:
View side-by-side diff with in-line comments
Download patch
Index: ui/gfx/gl/gl.gyp
diff --git a/ui/gfx/gl/gl.gyp b/ui/gfx/gl/gl.gyp
index 22e40b9ac641dc84fd4813a2a95b60bc41f31c8d..01292fcd0178c2b198e736f711407b22bcfa748c 100644
--- a/ui/gfx/gl/gl.gyp
+++ b/ui/gfx/gl/gl.gyp
@@ -40,6 +40,7 @@
'gl_bindings_skia_in_process.h',
'gl_context.cc',
'gl_context.h',
+ 'gl_context_android.cc',
'gl_context_linux.cc',
'gl_context_mac.cc',
'gl_context_osmesa.cc',
@@ -50,6 +51,7 @@
'gl_export.h',
'gl_implementation.cc',
'gl_implementation.h',
+ 'gl_implementation_android.cc',
'gl_implementation_linux.cc',
'gl_implementation_mac.cc',
'gl_implementation_win.cc',
@@ -114,7 +116,7 @@
},
],
'conditions': [
- ['OS != "mac" and OS != "android"', {
+ ['OS != "mac"', {
'sources': [
'egl_util.cc',
'egl_util.h',
@@ -172,6 +174,17 @@
],
},
}],
+ ['OS=="android"', {
+ 'sources!': [
+ '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.cc',
+ '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.h',
+ 'system_monitor_posix.cc',
+ ],
+ 'defines': [
+ 'GL_GLEXT_PROTOTYPES',
+ 'EGL_EGLEXT_PROTOTYPES',
+ ],
+ }]
],
},
],

Powered by Google App Engine
This is Rietveld 408576698