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

Side by Side Diff: ppapi/ppapi.gyp

Issue 7320002: Allow C/C++ targets to be suffixed for use in Native Client checkout. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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 | ppapi/ppapi_cpp.gypi » ('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 # This is the "public" ppapi.gyp file, which must have dependencies on the 5 # This is the "public" ppapi.gyp file, which must have dependencies on the
6 # redistributable portions of PPAPI only. This prevents circular dependencies 6 # redistributable portions of PPAPI only. This prevents circular dependencies
7 # in the .gyp files (since ppapi_internal depends on parts of Chrome). 7 # in the .gyp files (since ppapi_internal depends on parts of Chrome).
8 8
9 { 9 {
10 'variables': { 10 'variables': {
11 'chromium_code': 1, # Use higher warning level. 11 'chromium_code': 1, # Use higher warning level.
12
13 # NaCl also uses the C and C++ PPAPI targets. We want it to be able to use
14 # its own version of PPAPI when compiling into Chrome, which means we'll
15 # actually have two instances of each library in the checkout (though not
16 # compiled into the same binary since NaCl is a shared library).
17 #
18 # This value is the suffix that will be appended to the relevant projects.
19 # In Chrome, it's empty so the projects have the same name. NaCl sets this
20 # to "_nacl" and includes the .gypi files below, giving it different names
21 # for these projects.
22 'nacl_ppapi_library_suffix': '',
12 }, 23 },
13 'target_defaults': { 24 'target_defaults': {
14 'conditions': [ 25 'conditions': [
15 # Linux shared libraries should always be built -fPIC. 26 # Linux shared libraries should always be built -fPIC.
16 # 27 #
17 # TODO(ajwong): For internal pepper plugins, which are statically linked 28 # TODO(ajwong): For internal pepper plugins, which are statically linked
18 # into chrome, do we want to build w/o -fPIC? If so, how can we express 29 # into chrome, do we want to build w/o -fPIC? If so, how can we express
19 # that in the build system? 30 # that in the build system?
20 ['os_posix == 1 and OS != "mac"', { 31 ['os_posix == 1 and OS != "mac"', {
21 'cflags': ['-fPIC', '-fvisibility=hidden'], 32 'cflags': ['-fPIC', '-fvisibility=hidden'],
22 33
23 # This is needed to make the Linux shlib build happy. Without this, 34 # This is needed to make the Linux shlib build happy. Without this,
24 # -fvisibility=hidden gets stripped by the exclusion in common.gypi 35 # -fvisibility=hidden gets stripped by the exclusion in common.gypi
25 # that is triggered when a shared library build is specified. 36 # that is triggered when a shared library build is specified.
26 'cflags/': [['include', '^-fvisibility=hidden$']], 37 'cflags/': [['include', '^-fvisibility=hidden$']],
27 }], 38 }],
28 ], 39 ],
29 }, 40 },
30 'includes': [ 41 'includes': [
31 'ppapi_cpp.gypi', 42 'ppapi_cpp.gypi',
32 'ppapi_gl.gypi', 43 'ppapi_gl.gypi',
33 ], 44 ],
34 } 45 }
OLDNEW
« no previous file with comments | « no previous file | ppapi/ppapi_cpp.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698