Disable surfaceless EGL on Android

ui/gl/gl_surface_egl.cc

Index: ui/gl/gl_surface_egl.cc
diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc
index f978b23883cb13269f518e592699dab07aed2082..3d494680e9c19d8ca14aa921ed4124792ae44d2c 100644
--- a/ui/gl/gl_surface_egl.cc
+++ b/ui/gl/gl_surface_egl.cc
@@ -169,6 +169,13 @@ bool GLSurfaceEGL::InitializeOneOff() {
   g_egl_window_fixed_size_supported =
       HasEGLExtension("EGL_ANGLE_window_fixed_size");
 
+  // TODO(oetuaho@nvidia.com): Surfaceless is disabled on Android as a temporary
+  // workaround, since code written for Android WebView takes different paths
+  // based on whether GL surface objects have underlying EGL surface handles,
+  // conflicting with the use of surfaceless. See https://crbug.com/382349
+#if defined(OS_ANDROID)
+  DCHECK(!g_egl_surfaceless_context_supported);
+#else
   // Check if SurfacelessEGL is supported.
   g_egl_surfaceless_context_supported =
       HasEGLExtension("EGL_KHR_surfaceless_context");
@@ -189,6 +196,7 @@ bool GLSurfaceEGL::InitializeOneOff() {
       context->ReleaseCurrent(surface.get());
     }
   }
+#endif
 
   initialized = true;