summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-06 21:10:23 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-06 21:10:23 +0000
commit0033cc6fe696a94e6fcaafe4ba5d3d1fcb4421cb (patch)
treee77ca1f18ec9e64a9e3f5a6c377f2eebb33372dc /build
parent1dcd5e8c3061bcd016dd99a04b939ba23e60497f (diff)
downloadchromium_src-0033cc6fe696a94e6fcaafe4ba5d3d1fcb4421cb.zip
chromium_src-0033cc6fe696a94e6fcaafe4ba5d3d1fcb4421cb.tar.gz
chromium_src-0033cc6fe696a94e6fcaafe4ba5d3d1fcb4421cb.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35649 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/all.gyp4
1 files changed, 1 insertions, 3 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 70d3036..c5031a8 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -36,6 +36,7 @@
'../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:*',
@@ -104,9 +105,6 @@
'../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': [