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

Side by Side Diff: ppapi.gyp

Issue 3018003: Fix the -fvisibility=hidden settings to work with the linux shlib build.... (Closed) Base URL: http://ppapi.googlecode.com/svn/trunk/
Patch Set: '' Created 10 years, 5 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 | « no previous file | no next file » | 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 'variables': { 7 'variables': {
8 'chromium_code': 1, # Use higher warning level. 8 'chromium_code': 1, # Use higher warning level.
9 },
10 'target_defaults': {
9 'conditions': [ 11 'conditions': [
10 # Linux shared libraries should always be built -fPIC. 12 # Linux shared libraries should always be built -fPIC.
11 # 13 #
12 # TODO(ajwong): For internal pepper plugins, which are statically linked 14 # TODO(ajwong): For internal pepper plugins, which are statically linked
13 # into chrome, do we want to build w/o -fPIC? If so, how can we express 15 # into chrome, do we want to build w/o -fPIC? If so, how can we express
14 # that in the build system? 16 # that in the build system?
15 ['OS=="linux" or OS=="openbsd" or OS=="freebsd" or OS=="solaris"', { 17 ['OS=="linux" or OS=="openbsd" or OS=="freebsd" or OS=="solaris"', {
16 'use_fpic': 1, 18 'cflags': ['-fPIC', '-fvisibility=hidden'],
17 },{ 19
18 'use_fpic': 0, 20 # This is needed to make the Linux shlib build happy. Without this,
21 # -fvisibility=hidden gets stripped by the exclusion in common.gypi
22 # that is triggered when a shared library build is specified.
23 'cflags/': [['include', '^-fvisibility=hidden$']],
19 }], 24 }],
20 ], 25 ],
21 }, 26 },
22 'targets': [ 27 'targets': [
23 { 28 {
24 'target_name': 'ppapi_c', 29 'target_name': 'ppapi_c',
25 'type': 'none', 30 'type': 'none',
26 'all_dependent_settings': { 31 'all_dependent_settings': {
27 'include_dirs': [ 32 'include_dirs': [
28 '..', 33 '..',
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 ], 137 ],
133 'conditions': [ 138 'conditions': [
134 ['OS=="win"', { 139 ['OS=="win"', {
135 'msvs_guid': 'AD371A1D-3459-4E2D-8E8A-881F4B83B908', 140 'msvs_guid': 'AD371A1D-3459-4E2D-8E8A-881F4B83B908',
136 'msvs_settings': { 141 'msvs_settings': {
137 'VCCLCompilerTool': { 142 'VCCLCompilerTool': {
138 'AdditionalOptions': ['/we4244'], # implicit conversion, possible loss of data 143 'AdditionalOptions': ['/we4244'], # implicit conversion, possible loss of data
139 }, 144 },
140 }, 145 },
141 }], 146 }],
142 ['use_fpic==1', {
143 'cflags': ['-fPIC'],
144 }],
145 ['OS=="linux"', { 147 ['OS=="linux"', {
146 'cflags': ['-Wextra', '-pedantic'], 148 'cflags': ['-Wextra', '-pedantic'],
147 }], 149 }],
148 ['OS=="mac"', { 150 ['OS=="mac"', {
149 'xcode_settings': { 151 'xcode_settings': {
150 'WARNING_CFLAGS': ['-Wextra', '-pedantic'], 152 'WARNING_CFLAGS': ['-Wextra', '-pedantic'],
151 }, 153 },
152 }] 154 }]
153 ], 155 ],
154 }, 156 },
155 { 157 {
156 'target_name': 'ppapi_cpp', 158 'target_name': 'ppapi_cpp',
157 'type': 'static_library', 159 'type': 'static_library',
158 'dependencies': [ 160 'dependencies': [
159 'ppapi_c', 161 'ppapi_c',
160 'ppapi_cpp_objects', 162 'ppapi_cpp_objects',
161 ], 163 ],
162 'include_dirs': [ 164 'include_dirs': [
163 '..', 165 '..',
164 ], 166 ],
165 'sources': [ 167 'sources': [
166 'cpp/module_embedder.h', 168 'cpp/module_embedder.h',
167 'cpp/ppp_entrypoints.cc', 169 'cpp/ppp_entrypoints.cc',
168 ], 170 ],
169 'conditions': [ 171 'conditions': [
170 ['OS=="win"', { 172 ['OS=="win"', {
171 'msvs_guid': '057E7FA0-83C0-11DF-8395-0800200C9A66', 173 'msvs_guid': '057E7FA0-83C0-11DF-8395-0800200C9A66',
172 }], 174 }],
173 ['use_fpic==1', {
174 'cflags': ['-fPIC'],
175 }],
176 ['OS=="linux"', { 175 ['OS=="linux"', {
177 'cflags': ['-Wextra', '-pedantic'], 176 'cflags': ['-Wextra', '-pedantic'],
178 }], 177 }],
179 ['OS=="mac"', { 178 ['OS=="mac"', {
180 'xcode_settings': { 179 'xcode_settings': {
181 'WARNING_CFLAGS': ['-Wextra', '-pedantic'], 180 'WARNING_CFLAGS': ['-Wextra', '-pedantic'],
182 }, 181 },
183 }] 182 }]
184 ], 183 ],
185 }, 184 },
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 }], 219 }],
221 ['OS=="mac"', { 220 ['OS=="mac"', {
222 'type': 'loadable_module', 221 'type': 'loadable_module',
223 'mac_bundle': 1, 222 'mac_bundle': 1,
224 'product_name': 'PPAPIExample', 223 'product_name': 'PPAPIExample',
225 'product_extension': 'plugin', 224 'product_extension': 'plugin',
226 'sources+': [ 225 'sources+': [
227 'example/Info.plist' 226 'example/Info.plist'
228 ], 227 ],
229 }], 228 }],
230 ['use_fpic', {
231 'cflags': ['-fPIC'],
232 }],
233 ], 229 ],
234 # See README for instructions on how to run and debug on the Mac. 230 # See README for instructions on how to run and debug on the Mac.
235 #'conditions' : [ 231 #'conditions' : [
236 # ['OS=="mac"', { 232 # ['OS=="mac"', {
237 # 'target_name' : 'Chromium', 233 # 'target_name' : 'Chromium',
238 # 'type' : 'executable', 234 # 'type' : 'executable',
239 # 'xcode_settings' : { 235 # 'xcode_settings' : {
240 # 'ARGUMENTS' : '--renderer-startup-dialog --internal-pepper --no-san dbox file://${SRCROOT}/test_page.html' 236 # 'ARGUMENTS' : '--renderer-startup-dialog --internal-pepper --no-san dbox file://${SRCROOT}/test_page.html'
241 # }, 237 # },
242 # }], 238 # }],
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 '_CRT_NONSTDC_NO_WARNINGS', 272 '_CRT_NONSTDC_NO_WARNINGS',
277 '_CRT_NONSTDC_NO_DEPRECATE', 273 '_CRT_NONSTDC_NO_DEPRECATE',
278 '_SCL_SECURE_NO_DEPRECATE', 274 '_SCL_SECURE_NO_DEPRECATE',
279 ], 275 ],
280 }], 276 }],
281 ['OS=="mac"', { 277 ['OS=="mac"', {
282 'mac_bundle': 1, 278 'mac_bundle': 1,
283 'product_name': 'ppapi_tests', 279 'product_name': 'ppapi_tests',
284 'product_extension': 'plugin', 280 'product_extension': 'plugin',
285 }], 281 }],
286 ['use_fpic', {
287 'cflags': ['-fPIC'],
288 }],
289 ], 282 ],
290 }, 283 },
291 ], 284 ],
292 } 285 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698