This CL is for Neb. It contains his change 501124, with conflicts merged.

build/all.gyp

 # Copyright (c) 2009 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.
 
 {
   'targets': [
     {
       'target_name': 'All',
       'type': 'none',
       'xcode_create_dependents_test_runner': 1,
@@ skipping 86 matching lines @@
             '../gears/gears.gyp:*',
             '../gpu/demos/demos.gyp:*',
             '../gpu/gpu.gyp:*',
             '../rlz/rlz.gyp:*',
             '../sandbox/sandbox.gyp:*',
             '../third_party/bsdiff/bsdiff.gyp:*',
             '../third_party/bspatch/bspatch.gyp:*',
             '../third_party/cld/cld.gyp:*',
             '../third_party/gles2_book/gles2_book.gyp:*',
             '../tools/memory_watcher/memory_watcher.gyp:*',
-            # As of now Skia build has problems with Linux and/or 64 bits.
-            # TODO(sehr,brettw): Make this unconditional.
+            # As of now, build machines do not have GL headers to compile this
+            # TODO(sehr,brettw, neb): Make this unconditional.
             '../webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp:*',
           ],
         }, {
           'dependencies': [
             '../third_party/libevent/libevent.gyp:*',
           ],
         }],
         ['OS=="win" or (OS=="linux" and toolkit_views==1)', {
           'dependencies': [
             '../views/views.gyp:*',
@@ skipping 131 matching lines @@
       ],  # targets
     }], # OS="win"
   ], # conditions
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: