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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 1
2 { 2 {
3 'targets': [ 3 'targets': [
4 { 4 {
5 'target_name': 'pepper_test_plugin', 5 'target_name': 'pepper_test_plugin',
6 'type': 'shared_library', 6 'type': 'shared_library',
7 'dependencies': [ 7 'dependencies': [
8 '../../../base/base.gyp:base',
9 '../../../skia/skia.gyp:skia',
8 '../../../third_party/npapi/npapi.gyp:npapi', 10 '../../../third_party/npapi/npapi.gyp:npapi',
9 ], 11 ],
10 'include_dirs': [ 12 'include_dirs': [
11 '../../..', # Root of Chrome Checkout 13 '../../..', # Root of Chrome Checkout
12 ], 14 ],
13 'conditions': [ 15 'conditions': [
14 ['OS=="win"', { 16 ['OS=="win"', {
15 'product_name': 'pepper_test_plugin', 17 'product_name': 'pepper_test_plugin',
16 'msvs_guid': 'EE00E36E-9E8C-4DFB-925E-FBE32CEDB91A', 18 'msvs_guid': 'EE00E36E-9E8C-4DFB-925E-FBE32CEDB91A',
17 'dependencies': [ 19 'dependencies': [
18 '../../../gpu/gpu.gyp:gles2_demo_lib', 20 '../../../gpu/gpu.gyp:gles2_demo_lib',
19 ], 21 ],
20 'sources': [ 22 'sources': [
21 'pepper_test_plugin.def', 23 'pepper_test_plugin.def',
22 'pepper_test_plugin.rc', 24 'pepper_test_plugin.rc',
23 ], 25 ],
24 }], 26 }]
25 ['OS=="linux" and (target_arch=="x64" or target_arch=="arm")', {
26 # Shared libraries need -fPIC on x86-64
27 'cflags': ['-fPIC'],
28 'defines': ['INDEPENDENT_PLUGIN'],
29 }, {
30 'dependencies': [
31 '../../../base/base.gyp:base',
32 '../../../skia/skia.gyp:skia',
33 ],
34 }],
35 ], 27 ],
36 'sources': [ 28 'sources': [
37 'command_buffer_pepper.cc', 29 'command_buffer_pepper.cc',
38 'command_buffer_pepper.h', 30 'command_buffer_pepper.h',
39 'main.cc', 31 'main.cc',
40 'plugin_object.cc', 32 'plugin_object.cc',
41 'plugin_object.h', 33 'plugin_object.h',
42 'test_object.cc', 34 'test_object.cc',
43 'test_object.h', 35 'test_object.h',
44 'event_handler.cc', 36 'event_handler.cc',
45 'event_handler.h' 37 'event_handler.h'
46 ], 38 ],
47 'run_as': { 39 'run_as': {
48 'action': [ 40 'action': [
49 '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)chrome<(EXECUTABLE_SUFFIX)', 41 '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)chrome<(EXECUTABLE_SUFFIX)',
50 '--no-sandbox', 42 '--no-sandbox',
51 '--internal-pepper', 43 '--internal-pepper',
52 '--enable-gpu-plugin', 44 '--enable-gpu-plugin',
53 '--load-plugin=$(TargetPath)', 45 '--load-plugin=$(TargetPath)',
54 'file://$(ProjectDir)test_page.html', 46 'file://$(ProjectDir)test_page.html',
55 ], 47 ],
56 }, 48 },
57 } 49 }
58 ], 50 ],
59 } 51 }
OLDNEW
« 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