Rationalize linux vs x11 in ui

ui/gl/gl.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
 
   'targets': [
@@ skipping 48 matching lines @@
         'async_pixel_transfer_delegate_stub.h',
         'async_pixel_transfer_delegate_sync.cc',
         'async_pixel_transfer_delegate_sync.h',
         'async_pixel_transfer_delegate_win.cc',
         'gl_bindings.h',
         'gl_bindings_skia_in_process.cc',
         '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',
         'gl_context_osmesa.h',
         'gl_context_stub.cc',
         'gl_context_stub.h',
         'gl_context_win.cc',
+        'gl_context_x11.cc',
         'gl_export.h',
         'gl_fence.cc',
         'gl_fence.h',
         'gl_gl_api_implementation.cc',
         'gl_gl_api_implementation.h',
         'gl_image.cc',
         'gl_image.h',
         'gl_image_android.cc',
-        'gl_image_linux.cc',
         'gl_image_mac.cc',
         'gl_image_stub.cc',
         'gl_image_stub.h',
         'gl_image_win.cc',
+        'gl_image_x11.cc',
         'gl_implementation.cc',
         'gl_implementation.h',
         'gl_implementation_android.cc',
-        'gl_implementation_linux.cc',
         'gl_implementation_mac.cc',
         'gl_implementation_win.cc',
+        'gl_implementation_x11.cc',
         'gl_interface.cc',
         'gl_interface.h',
         'gl_osmesa_api_implementation.cc',
         'gl_osmesa_api_implementation.h',
         'gl_share_group.cc',
         'gl_share_group.h',
         'gl_state_restorer.cc',
         'gl_state_restorer.h',
         'gl_surface.cc',
         'gl_surface.h',
         'gl_surface_android.cc',
-        'gl_surface_linux.cc',
         'gl_surface_mac.cc',
         'gl_surface_stub.cc',
         'gl_surface_stub.h',
         'gl_surface_win.cc',
+        'gl_surface_x11.cc',
         'gl_surface_osmesa.cc',
         'gl_surface_osmesa.h',
         'gl_switches.cc',
         'gl_switches.h',
         'gpu_switching_manager.cc',
         'gpu_switching_manager.h',
         'safe_shared_memory_pool.h',
         'safe_shared_memory_pool.cc',
         'scoped_make_current.cc',
         'scoped_make_current.h',
@@ skipping 60 matching lines @@
           ],
           'action': [
             'python',
             '<(generator_path)',
             '--header-paths=<(header_paths)',
             '<(gl_binding_output_dir)',
           ],
         },
       ],
       'conditions': [
-        ['OS != "mac"', {
+        ['OS in ("win", "android") or (OS == "linux" and use_x11 == 1)', {
+#        ['OS in ("win", "android") or (OS == "linux")', {

[Ben Goodger (Google), 2013/04/29 15:59:18]

what's this commented out line?

           'sources': [
             'async_pixel_transfer_delegate_egl.cc',
             'async_pixel_transfer_delegate_egl.h',
             'egl_util.cc',
             'egl_util.h',
             'gl_context_egl.cc',
             'gl_context_egl.h',
             'gl_surface_egl.cc',
             'gl_surface_egl.h',
             'gl_egl_api_implementation.cc',
@@ skipping 154 matching lines @@
           ],
           'variables': {
             'jni_gen_package': 'ui/gl',
           },
           'includes': [ '../../build/jni_generator.gypi' ],
         },
       ],
     }],
   ],
 }