Upstream: GL implementation on Android

ui/gfx/gl/gl.gyp

Index: ui/gfx/gl/gl.gyp
diff --git a/ui/gfx/gl/gl.gyp b/ui/gfx/gl/gl.gyp
index 985053324b600d9004b13bd23b75602b7c9b4637..4ae929905fd2d3aa17d735b05191c67c90f329c5 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.mm',
         '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',
@@ -180,6 +182,17 @@
             'gl_surface_nsview.h',
           ],
         }],
+        ['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',
+          ],
+        }],
       ],
     },
   ],