diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-25 23:10:58 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-25 23:10:58 +0000 |
| commit | c76723a1f489484af50a177bd4020c1ed38e65ed (patch) | |
| tree | a6fe211e4f8fa42ac76818a4f9d2d27720897fba /webkit/tools | |
| parent | 55ac7ea2120b48f88040289986bb46d530e6c296 (diff) | |
| download | chromium_src-c76723a1f489484af50a177bd4020c1ed38e65ed.zip chromium_src-c76723a1f489484af50a177bd4020c1ed38e65ed.tar.gz chromium_src-c76723a1f489484af50a177bd4020c1ed38e65ed.tar.bz2 | |
linux: enable pepper plugin
This is CL 36399 that was reverted in 36969 because it caused an ICE on the official builders.
This adds a workaround for the ICE.
Review URL: http://codereview.chromium.org/546136
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37055 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp | 21 | ||||
| -rw-r--r-- | webkit/tools/pepper_test_plugin/plugin_object.cc | 2 |
2 files changed, 17 insertions, 6 deletions
diff --git a/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp b/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp index 1cdc8d3..f36abf7 100644 --- a/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp +++ b/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp @@ -30,10 +30,6 @@ 'product_name': 'pepper_test_plugin', 'type': 'shared_library', 'msvs_guid': 'EE00E36E-9E8C-4DFB-925E-FBE32CEDB91A', - 'dependencies': [ - '../../../gpu/gpu.gyp:gles2_demo_lib', - '../../../gpu/gpu.gyp:pgl', - ], 'sources': [ 'pepper_test_plugin.def', 'pepper_test_plugin.rc', @@ -49,7 +45,14 @@ ], }, }], - ['OS=="linux" and (target_arch=="x64" or target_arch=="arm")', { + ['OS=="linux"', { + 'type': 'shared_library', + 'cflags': ['-fvisibility=hidden'], + # -gstabs, used in the official builds, causes an ICE. Simply remove + # it. + 'cflags!': ['-gstabs'], + }], + ['OS=="linux" and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', { 'product_name': 'pepper_test_plugin', # Shared libraries need -fPIC on x86-64 'cflags': ['-fPIC'], @@ -59,6 +62,14 @@ '../../../base/base.gyp:base', '../../../skia/skia.gyp:skia', ], + 'conditions': [ + ['OS!="mac"', { + 'dependencies': [ + '../../../gpu/gpu.gyp:gles2_demo_lib', + '../../../gpu/gpu.gyp:pgl', + ], + }], + ] }], ['OS=="mac"', { 'type': 'loadable_module', diff --git a/webkit/tools/pepper_test_plugin/plugin_object.cc b/webkit/tools/pepper_test_plugin/plugin_object.cc index aa6422d..7738a8cc 100644 --- a/webkit/tools/pepper_test_plugin/plugin_object.cc +++ b/webkit/tools/pepper_test_plugin/plugin_object.cc @@ -35,7 +35,7 @@ #else #include "base/logging.h" #include "gpu/command_buffer/client/gles2_demo_cc.h" -#include "gpu/command_buffer/common/gles2/gl2.h" +#include "gpu/command_buffer/common/GLES2/gl2.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/effects/SkGradientShader.h" |