Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1386)

Unified Diff: webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp

Issue 524051: Revert 35649 - Make Pepper plugins work on Linux.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/tools/pepper_test_plugin/main.cc ('k') | webkit/tools/pepper_test_plugin/plugin_object.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp
===================================================================
--- webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp (revision 35652)
+++ webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp (working copy)
@@ -5,6 +5,8 @@
'target_name': 'pepper_test_plugin',
'type': 'shared_library',
'dependencies': [
+ '../../../base/base.gyp:base',
+ '../../../skia/skia.gyp:skia',
'../../../third_party/npapi/npapi.gyp:npapi',
],
'include_dirs': [
@@ -21,17 +23,7 @@
'pepper_test_plugin.def',
'pepper_test_plugin.rc',
],
- }],
- ['OS=="linux" and (target_arch=="x64" or target_arch=="arm")', {
- # Shared libraries need -fPIC on x86-64
- 'cflags': ['-fPIC'],
- 'defines': ['INDEPENDENT_PLUGIN'],
- }, {
- 'dependencies': [
- '../../../base/base.gyp:base',
- '../../../skia/skia.gyp:skia',
- ],
- }],
+ }]
],
'sources': [
'command_buffer_pepper.cc',
« no previous file with comments | « webkit/tools/pepper_test_plugin/main.cc ('k') | webkit/tools/pepper_test_plugin/plugin_object.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698