Re-enable the build of Pepper support by default (issue 464074, svn revision ...

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 17 matching lines @@
         '../third_party/libpng/libpng.gyp:*',
         '../third_party/libxml/libxml.gyp:*',
         '../third_party/libxslt/libxslt.gyp:*',
         '../third_party/lzma_sdk/lzma_sdk.gyp:*',
         '../third_party/modp_b64/modp_b64.gyp:*',
         '../third_party/npapi/npapi.gyp:*',
         '../third_party/ots/ots.gyp:*',
         '../third_party/sqlite/sqlite.gyp:*',
         '../third_party/WebKit/WebKit/chromium/WebKit.gyp:*',
         '../third_party/zlib/zlib.gyp:*',
+        '../webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp:*',
         '../webkit/tools/test_shell/test_shell.gyp:*',
         '../webkit/webkit.gyp:*',
         'util/build_util.gyp:*',
         'temp_gyp/googleurl.gyp:*',
       ],
       'conditions': [
         ['javascript_engine=="v8"', {
           'dependencies': [
             '../v8/tools/gyp/v8.gyp:*',
           ],
         }],
         ['chrome_frame_define==1', {
           'dependencies': [
             '../chrome_frame/chrome_frame.gyp:*',
           ],
         }],
-        ['enable_pepper==1', {
+        ['enable_gpu==1', {
           'dependencies': [
-            '../webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp:*',
             '../gpu/gpu.gyp:*',
           ],
         }],
         ['OS=="mac" or OS=="linux" or OS=="freebsd"', {
           'dependencies': [
             '../third_party/yasm/yasm.gyp:*#host',
            ],
         }],
         ['OS=="mac"', {
           'dependencies': [
@@ skipping 29 matching lines @@
             '../breakpad/breakpad.gyp:*',
             '../chrome/app/locales/locales.gyp:*',
             '../courgette/courgette.gyp:*',
             '../gears/gears.gyp:*',
             '../rlz/rlz.gyp:*',
             '../sandbox/sandbox.gyp:*',
             '../third_party/bsdiff/bsdiff.gyp:*',
             '../third_party/bspatch/bspatch.gyp:*',
             '../third_party/cld/cld.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.
+            '../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 111 matching lines @@
       ],  # targets
     }], # OS="win"
   ], # conditions
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: