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

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

Issue 548133: Revert 36399 - linux: enable pepper_test_plugin ... (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 | « gpu/pgl/pgl.cc ('k') | webkit/tools/pepper_test_plugin/plugin_object.cc » ('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 36968)
+++ webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp (working copy)
@@ -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',
« no previous file with comments | « gpu/pgl/pgl.cc ('k') | webkit/tools/pepper_test_plugin/plugin_object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698