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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « gpu/pgl/pgl.cc ('k') | webkit/tools/pepper_test_plugin/plugin_object.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 5
6 { 6 {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'pepper_test_plugin', 9 'target_name': 'pepper_test_plugin',
10 'dependencies': [ 10 'dependencies': [
(...skipping 12 matching lines...) Expand all
23 'test_object.cc', 23 'test_object.cc',
24 'test_object.h', 24 'test_object.h',
25 'event_handler.cc', 25 'event_handler.cc',
26 'event_handler.h' 26 'event_handler.h'
27 ], 27 ],
28 'conditions': [ 28 'conditions': [
29 ['OS=="win"', { 29 ['OS=="win"', {
30 'product_name': 'pepper_test_plugin', 30 'product_name': 'pepper_test_plugin',
31 'type': 'shared_library', 31 'type': 'shared_library',
32 'msvs_guid': 'EE00E36E-9E8C-4DFB-925E-FBE32CEDB91A', 32 'msvs_guid': 'EE00E36E-9E8C-4DFB-925E-FBE32CEDB91A',
33 'dependencies': [
34 '../../../gpu/gpu.gyp:gles2_demo_lib',
35 '../../../gpu/gpu.gyp:pgl',
36 ],
33 'sources': [ 37 'sources': [
34 'pepper_test_plugin.def', 38 'pepper_test_plugin.def',
35 'pepper_test_plugin.rc', 39 'pepper_test_plugin.rc',
36 ], 40 ],
37 'run_as': { 41 'run_as': {
38 'action': [ 42 'action': [
39 '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)chrome<(EXECUTABLE_SUFFIX)', 43 '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)chrome<(EXECUTABLE_SUFFIX)',
40 '--no-sandbox', 44 '--no-sandbox',
41 '--internal-pepper', 45 '--internal-pepper',
42 '--enable-gpu-plugin', 46 '--enable-gpu-plugin',
43 '--load-plugin=$(TargetPath)', 47 '--load-plugin=$(TargetPath)',
44 'file://$(ProjectDir)test_page.html', 48 'file://$(ProjectDir)test_page.html',
45 ], 49 ],
46 }, 50 },
47 }], 51 }],
48 ['OS=="linux"', { 52 ['OS=="linux" and (target_arch=="x64" or target_arch=="arm")', {
49 'type': 'shared_library',
50 'cflags': ['-fvisibility=hidden'],
51 }],
52 ['OS=="linux" and (target_arch=="x64" or target_arch=="arm") and linux_f pic!=1', {
53 'product_name': 'pepper_test_plugin', 53 'product_name': 'pepper_test_plugin',
54 # Shared libraries need -fPIC on x86-64 54 # Shared libraries need -fPIC on x86-64
55 'cflags': ['-fPIC'], 55 'cflags': ['-fPIC'],
56 'defines': ['INDEPENDENT_PLUGIN'], 56 'defines': ['INDEPENDENT_PLUGIN'],
57 }, { 57 }, {
58 'dependencies': [ 58 'dependencies': [
59 '../../../base/base.gyp:base', 59 '../../../base/base.gyp:base',
60 '../../../skia/skia.gyp:skia', 60 '../../../skia/skia.gyp:skia',
61 ], 61 ],
62 'conditions': [
63 ['OS!="mac"', {
64 'dependencies': [
65 '../../../gpu/gpu.gyp:gles2_demo_lib',
66 '../../../gpu/gpu.gyp:pgl',
67 ],
68 }],
69 ]
70 }], 62 }],
71 ['OS=="mac"', { 63 ['OS=="mac"', {
72 'type': 'loadable_module', 64 'type': 'loadable_module',
73 'mac_bundle': 1, 65 'mac_bundle': 1,
74 'product_name': 'PepperTestPlugin', 66 'product_name': 'PepperTestPlugin',
75 'product_extension': 'plugin', 67 'product_extension': 'plugin',
76 'defines': ['INDEPENDENT_PLUGIN'], 68 'defines': ['INDEPENDENT_PLUGIN'],
77 'sources+': [ 69 'sources+': [
78 'Info.plist' 70 'Info.plist'
79 ], 71 ],
80 }], 72 }],
81 ], 73 ],
82 # See README for instructions on how to run and debug on the Mac. 74 # See README for instructions on how to run and debug on the Mac.
83 #'conditions' : [ 75 #'conditions' : [
84 # ['OS=="mac"', { 76 # ['OS=="mac"', {
85 # 'target_name' : 'Chromium', 77 # 'target_name' : 'Chromium',
86 # 'type' : 'executable', 78 # 'type' : 'executable',
87 # 'xcode_settings' : { 79 # 'xcode_settings' : {
88 # 'ARGUMENTS' : '--renderer-startup-dialog --internal-pepper --no-san dbox file://${SRCROOT}/test_page.html' 80 # 'ARGUMENTS' : '--renderer-startup-dialog --internal-pepper --no-san dbox file://${SRCROOT}/test_page.html'
89 # }, 81 # },
90 # }], 82 # }],
91 #], 83 #],
92 }, 84 },
93 ], 85 ],
94 } 86 }
OLDNEW
« 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