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

Side by Side Diff: ppapi/ppapi_internal.gyp

Issue 10828023: PPAPI/NaCl: Make NaClIPCAdapter transfer handles more generally (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Build configuration bingo: Fix linux_clang? Created 8 years, 4 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 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'variables': { 6 'variables': {
7 'chromium_code': 1, # Use higher warning level. 7 'chromium_code': 1, # Use higher warning level.
8 }, 8 },
9 'target_defaults': { 9 'target_defaults': {
10 'conditions': [ 10 'conditions': [
11 # Linux shared libraries should always be built -fPIC. 11 # Linux shared libraries should always be built -fPIC.
12 # 12 #
13 # TODO(ajwong): For internal pepper plugins, which are statically linked 13 # TODO(ajwong): For internal pepper plugins, which are statically linked
14 # into chrome, do we want to build w/o -fPIC? If so, how can we express 14 # into chrome, do we want to build w/o -fPIC? If so, how can we express
15 # that in the build system? 15 # that in the build system?
16 ['os_posix==1 and OS!="android" and OS!="mac"', { 16 ['os_posix==1 and OS!="android" and OS!="mac"', {
17 'cflags': ['-fPIC', '-fvisibility=hidden'], 17 'cflags': ['-fPIC', '-fvisibility=hidden'],
18 18
19 # This is needed to make the Linux shlib build happy. Without this, 19 # This is needed to make the Linux shlib build happy. Without this,
20 # -fvisibility=hidden gets stripped by the exclusion in common.gypi 20 # -fvisibility=hidden gets stripped by the exclusion in common.gypi
21 # that is triggered when a shared library build is specified. 21 # that is triggered when a shared library build is specified.
22 'cflags/': [['include', '^-fvisibility=hidden$']], 22 'cflags/': [['include', '^-fvisibility=hidden$']],
23 }], 23 }],
24 ], 24 ],
25 }, 25 },
26 'conditions': [
27 ['disable_nacl!=1' and 'OS=="win"', {
28 'targets': [
29 {
30 'target_name': 'ppapi_shared_win64',
31 'type': '<(component)',
32 'variables': {
33 'nacl_target': 1,
34 'ppapi_shared_target': 1,
35 },
36 'dependencies': [
37 'ppapi.gyp:ppapi_c',
38 '../base/base.gyp:base_nacl_win64',
39 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations_win64',
40 ],
41 'defines': [
42 '<@(nacl_win64_defines)',
43 ],
44 'export_dependent_settings': [
45 '../base/base.gyp:base_nacl_win64',
46 ],
47 'configurations': {
48 'Common_Base': {
49 'msvs_target_platform': 'x64',
50 },
51 },
52 },
53 {
54 'target_name': 'ppapi_proxy_win64',
55 'type': '<(component)',
56 'variables': {
57 'nacl_target': 1,
58 'ppapi_proxy_target': 1,
59 },
60 'dependencies': [
61 '../base/base.gyp:base_nacl_win64',
62 '../ipc/ipc.gyp:ipc_win64',
63 '../gpu/gpu.gyp:gpu_ipc_win64',
64 'ppapi.gyp:ppapi_c',
65 'ppapi_shared_win64',
66 ],
67 'defines': [
68 '<@(nacl_win64_defines)',
69 ],
70 'all_dependent_settings': {
71 'include_dirs': [
72 '..',
73 ],
74 },
75 'configurations': {
76 'Common_Base': {
77 'msvs_target_platform': 'x64',
78 },
79 },
80 }],
81 }],
82 ],
26 'includes': [ 83 'includes': [
27 'ppapi_sources.gypi', 84 'ppapi_sources.gypi',
28 'ppapi_host.gypi', 85 'ppapi_host.gypi',
29 'ppapi_proxy.gypi', 86 'ppapi_proxy.gypi',
30 'ppapi_shared.gypi', 87 'ppapi_shared.gypi',
31 'ppapi_tests.gypi', 88 'ppapi_tests.gypi',
32 ], 89 ],
33 'targets': [ 90 'targets': [
34 { 91 {
35 'target_name': 'ppapi_shared', 92 'target_name': 'ppapi_shared',
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 '../ui/surface/surface.gyp:surface', 140 '../ui/surface/surface.gyp:surface',
84 'ppapi.gyp:ppapi_c', 141 'ppapi.gyp:ppapi_c',
85 'ppapi_shared', 142 'ppapi_shared',
86 ], 143 ],
87 'all_dependent_settings': { 144 'all_dependent_settings': {
88 'include_dirs': [ 145 'include_dirs': [
89 '..', 146 '..',
90 ], 147 ],
91 }, 148 },
92 }, 149 },
93 ] 150 ],
94 } 151 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698