diff options
| author | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-06 22:14:53 +0000 |
|---|---|---|
| committer | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-06 22:14:53 +0000 |
| commit | f1002ee286ad56e2b80736661e89989b650aad6e (patch) | |
| tree | e7f82831f9bccd51fa10ba0c6b28501a5ad83aaa /build | |
| parent | 3ccfe535658c8852c1cc1df01372ecc602f376cd (diff) | |
| download | chromium_src-f1002ee286ad56e2b80736661e89989b650aad6e.zip chromium_src-f1002ee286ad56e2b80736661e89989b650aad6e.tar.gz chromium_src-f1002ee286ad56e2b80736661e89989b650aad6e.tar.bz2 | |
Revert 35649 - Make Pepper plugins work on Linux.
fix pepper_test_plugin so that it is loaded on Linux
remove skia & base dependency in test plugin so that it can be compiled with fPIC
remove ifdef WIN in pepper code
Patch by neb@chromium.org
Original review: http://codereview.chromium.org/501124/show
BUG=none
TEST=none
TBR=brettw@chromium.org
Review URL: http://codereview.chromium.org/524051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35653 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp index c5031a8..70d3036 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -36,7 +36,6 @@ '../third_party/WebKit/WebKit/chromium/WebKit.gyp:*', '../third_party/zlib/zlib.gyp:*', '../webkit/tools/test_shell/test_shell.gyp:*', - '../webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp:*', '../webkit/webkit.gyp:*', 'util/build_util.gyp:*', 'temp_gyp/googleurl.gyp:*', @@ -105,6 +104,9 @@ '../third_party/cld/cld.gyp:*', '../third_party/gles_book_examples/gles_book_examples.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': [ |