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

Side by Side Diff: chrome/nacl.gypi

Issue 10828023: PPAPI/NaCl: Make NaClIPCAdapter transfer handles more generally (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed some proxy changes that aren't necessary now 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 'include': [ 6 'include': [
7 '../native_client/build/untrusted.gypi', 7 '../native_client/build/untrusted.gypi',
8 ], 8 ],
9 'target_defaults': { 9 'target_defaults': {
10 'variables': { 10 'variables': {
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 { 66 {
67 'target_name': 'nacl', 67 'target_name': 'nacl',
68 'type': 'static_library', 68 'type': 'static_library',
69 'variables': { 69 'variables': {
70 'nacl_target': 1, 70 'nacl_target': 1,
71 }, 71 },
72 'dependencies': [ 72 'dependencies': [
73 '../base/base.gyp:base', 73 '../base/base.gyp:base',
74 '../ipc/ipc.gyp:ipc', 74 '../ipc/ipc.gyp:ipc',
75 '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPl uginChrome', 75 '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPl uginChrome',
76 '../ppapi/ppapi_internal.gyp:ppapi_shared',
77 '../ppapi/ppapi_internal.gyp:ppapi_ipc',
76 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l', 78 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l',
77 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp: platform_qual_lib', 79 '../native_client/src/trusted/platform_qualify/platform_qualify.gyp: platform_qual_lib',
78 ], 80 ],
79 'conditions': [ 81 'conditions': [
80 ['disable_nacl_untrusted==0', { 82 ['disable_nacl_untrusted==0', {
81 'dependencies': [ 83 'dependencies': [
82 '../ppapi/native_client/native_client.gyp:nacl_irt', 84 '../ppapi/native_client/native_client.gyp:nacl_irt',
83 ], 85 ],
84 }], 86 }],
85 ['disable_nacl_untrusted==0 and target_arch!="arm"', { 87 ['disable_nacl_untrusted==0 and target_arch!="arm"', {
(...skipping 14 matching lines...) Expand all
100 'targets': [ 102 'targets': [
101 { 103 {
102 'target_name': 'nacl_win64', 104 'target_name': 'nacl_win64',
103 'type': 'static_library', 105 'type': 'static_library',
104 'variables': { 106 'variables': {
105 'nacl_target': 1, 107 'nacl_target': 1,
106 }, 108 },
107 'dependencies': [ 109 'dependencies': [
108 '../native_client/src/trusted/service_runtime/service_runtime.gy p:sel64', 110 '../native_client/src/trusted/service_runtime/service_runtime.gy p:sel64',
109 '../native_client/src/trusted/platform_qualify/platform_qualify. gyp:platform_qual_lib64', 111 '../native_client/src/trusted/platform_qualify/platform_qualify. gyp:platform_qual_lib64',
112 '../ppapi/ppapi_internal.gyp:ppapi_shared_win64',
brettw 2012/08/22 23:27:06 How much does this bloat the win64 binary by? I'd
dmichael (off chromium) 2012/08/23 22:55:14 Good question. It looks like a static, release bui
113 '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64',
114 ],
115 'export_dependent_settings': [
116 '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64',
110 ], 117 ],
111 'sources': [ 118 'sources': [
112 'common/nacl_cmd_line.cc', 119 'common/nacl_cmd_line.cc',
113 'common/nacl_debug_exception_handler_win.cc', 120 'common/nacl_debug_exception_handler_win.cc',
114 'common/nacl_messages.cc', 121 'common/nacl_messages.cc',
115 'common/nacl_types.cc', 122 'common/nacl_types.cc',
116 'nacl/nacl_broker_listener.cc', 123 'nacl/nacl_broker_listener.cc',
117 'nacl/nacl_broker_listener.h', 124 'nacl/nacl_broker_listener.h',
118 ], 125 ],
119 'include_dirs': [ 126 'include_dirs': [
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 'target_name': 'nacl_win64', 207 'target_name': 'nacl_win64',
201 'type': 'none', 208 'type': 'none',
202 'sources': [], 209 'sources': [],
203 }, 210 },
204 ], 211 ],
205 }], 212 }],
206 ], 213 ],
207 }], 214 }],
208 ], 215 ],
209 } 216 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698