diff options
| author | laforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-23 22:08:50 +0000 |
|---|---|---|
| committer | laforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-23 22:08:50 +0000 |
| commit | b656d73aaa4d75163e1226d4c4096560187f2488 (patch) | |
| tree | daff572a02d9a63f5c53026d099c4e966997a384 /webkit/tools | |
| parent | a950ac48188421b7b19a205e10648cbfbda0a88f (diff) | |
| download | chromium_src-b656d73aaa4d75163e1226d4c4096560187f2488.zip chromium_src-b656d73aaa4d75163e1226d4c4096560187f2488.tar.gz chromium_src-b656d73aaa4d75163e1226d4c4096560187f2488.tar.bz2 | |
Revert 36399 - linux: enable pepper_test_plugin
This is breaking official x64 builds, notified team of break earlier in the
week, but haven't seen a fix. I'm reverting now.
Please fix before re-enabling.
Original message:
This includes a way to build it with full support on x64 (and arm ?), by specifying linux_fpic=1 in GYP_DEFINES and rerunning gyp.
Review URL: http://codereview.chromium.org/551041
TBR=piman@chromium.org
Review URL: http://codereview.chromium.org/548133
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36969 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp | 18 | ||||
| -rw-r--r-- | webkit/tools/pepper_test_plugin/plugin_object.cc | 2 |
2 files changed, 6 insertions, 14 deletions
diff --git a/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp b/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp index 35ba1b0..1cdc8d3 100644 --- a/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp +++ b/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp @@ -30,6 +30,10 @@ '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', @@ -45,11 +49,7 @@ ], }, }], - ['OS=="linux"', { - 'type': 'shared_library', - 'cflags': ['-fvisibility=hidden'], - }], - ['OS=="linux" and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', { + ['OS=="linux" and (target_arch=="x64" or target_arch=="arm")', { 'product_name': 'pepper_test_plugin', # Shared libraries need -fPIC on x86-64 'cflags': ['-fPIC'], @@ -59,14 +59,6 @@ '../../../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 7738a8cc..aa6422d 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" |