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

Side by Side Diff: ppapi/native_client/native_client.gyp

Issue 878623004: NaCl: Remove the IRT's Gyp dependency on libsrpc (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 5 years, 10 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
« 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) 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 'includes': [ 6 'includes': [
7 '../../build/common_untrusted.gypi', 7 '../../build/common_untrusted.gypi',
8 ], 8 ],
9 'conditions': [ 9 'conditions': [
10 ['disable_nacl==0 and disable_nacl_untrusted==0', { 10 ['disable_nacl==0 and disable_nacl_untrusted==0', {
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 '-lgles2_implementation_nacl', 132 '-lgles2_implementation_nacl',
133 '-lgles2_cmd_helper_nacl', 133 '-lgles2_cmd_helper_nacl',
134 '-lgles2_utils_nacl', 134 '-lgles2_utils_nacl',
135 '-lcommand_buffer_client_nacl', 135 '-lcommand_buffer_client_nacl',
136 '-lcommand_buffer_common_nacl', 136 '-lcommand_buffer_common_nacl',
137 '-ltracing_nacl', 137 '-ltracing_nacl',
138 '-lgpu_ipc_nacl', 138 '-lgpu_ipc_nacl',
139 '-lipc_nacl', 139 '-lipc_nacl',
140 '-lbase_nacl', 140 '-lbase_nacl',
141 '-lshared_memory_support_nacl', 141 '-lshared_memory_support_nacl',
142 '-lsrpc',
143 '-limc_syscalls', 142 '-limc_syscalls',
144 '-lplatform', 143 '-lplatform',
145 '-lgio', 144 '-lgio',
146 '-Wl,--end-group', 145 '-Wl,--end-group',
147 '-lm', 146 '-lm',
148 ], 147 ],
149 'extra_args': [ 148 'extra_args': [
150 '--strip-all', 149 '--strip-all',
151 ], 150 ],
152 'conditions': [ 151 'conditions': [
(...skipping 21 matching lines...) Expand all
174 '>(tc_lib_dir_irt64)/libcommand_buffer_common_nacl.a', 173 '>(tc_lib_dir_irt64)/libcommand_buffer_common_nacl.a',
175 '>(tc_lib_dir_irt64)/libgpu_ipc_nacl.a', 174 '>(tc_lib_dir_irt64)/libgpu_ipc_nacl.a',
176 '>(tc_lib_dir_irt64)/libtracing_nacl.a', 175 '>(tc_lib_dir_irt64)/libtracing_nacl.a',
177 '>(tc_lib_dir_irt64)/libgles2_cmd_helper_nacl.a', 176 '>(tc_lib_dir_irt64)/libgles2_cmd_helper_nacl.a',
178 '>(tc_lib_dir_irt64)/libgles2_utils_nacl.a', 177 '>(tc_lib_dir_irt64)/libgles2_utils_nacl.a',
179 '>(tc_lib_dir_irt64)/libipc_nacl.a', 178 '>(tc_lib_dir_irt64)/libipc_nacl.a',
180 '>(tc_lib_dir_irt64)/libbase_nacl.a', 179 '>(tc_lib_dir_irt64)/libbase_nacl.a',
181 '>(tc_lib_dir_irt64)/libirt_browser.a', 180 '>(tc_lib_dir_irt64)/libirt_browser.a',
182 '>(tc_lib_dir_irt64)/libpnacl_irt_shim_for_irt.a', 181 '>(tc_lib_dir_irt64)/libpnacl_irt_shim_for_irt.a',
183 '>(tc_lib_dir_irt64)/libshared_memory_support_nacl.a', 182 '>(tc_lib_dir_irt64)/libshared_memory_support_nacl.a',
184 '>(tc_lib_dir_irt64)/libsrpc.a',
185 '>(tc_lib_dir_irt64)/libplatform.a', 183 '>(tc_lib_dir_irt64)/libplatform.a',
186 '>(tc_lib_dir_irt64)/libimc_syscalls.a', 184 '>(tc_lib_dir_irt64)/libimc_syscalls.a',
187 '>(tc_lib_dir_irt64)/libgio.a', 185 '>(tc_lib_dir_irt64)/libgio.a',
188 ], 186 ],
189 'extra_deps_newlib32': [ 187 'extra_deps_newlib32': [
190 '>(tc_lib_dir_irt32)/libppapi_proxy_nacl.a', 188 '>(tc_lib_dir_irt32)/libppapi_proxy_nacl.a',
191 '>(tc_lib_dir_irt32)/libppapi_ipc_nacl.a', 189 '>(tc_lib_dir_irt32)/libppapi_ipc_nacl.a',
192 '>(tc_lib_dir_irt32)/libppapi_shared_nacl.a', 190 '>(tc_lib_dir_irt32)/libppapi_shared_nacl.a',
193 '>(tc_lib_dir_irt32)/libgles2_implementation_nacl.a', 191 '>(tc_lib_dir_irt32)/libgles2_implementation_nacl.a',
194 '>(tc_lib_dir_irt32)/libcommand_buffer_client_nacl.a', 192 '>(tc_lib_dir_irt32)/libcommand_buffer_client_nacl.a',
195 '>(tc_lib_dir_irt32)/libcommand_buffer_common_nacl.a', 193 '>(tc_lib_dir_irt32)/libcommand_buffer_common_nacl.a',
196 '>(tc_lib_dir_irt32)/libgpu_ipc_nacl.a', 194 '>(tc_lib_dir_irt32)/libgpu_ipc_nacl.a',
197 '>(tc_lib_dir_irt32)/libtracing_nacl.a', 195 '>(tc_lib_dir_irt32)/libtracing_nacl.a',
198 '>(tc_lib_dir_irt32)/libgles2_cmd_helper_nacl.a', 196 '>(tc_lib_dir_irt32)/libgles2_cmd_helper_nacl.a',
199 '>(tc_lib_dir_irt32)/libgles2_utils_nacl.a', 197 '>(tc_lib_dir_irt32)/libgles2_utils_nacl.a',
200 '>(tc_lib_dir_irt32)/libipc_nacl.a', 198 '>(tc_lib_dir_irt32)/libipc_nacl.a',
201 '>(tc_lib_dir_irt32)/libbase_nacl.a', 199 '>(tc_lib_dir_irt32)/libbase_nacl.a',
202 '>(tc_lib_dir_irt32)/libirt_browser.a', 200 '>(tc_lib_dir_irt32)/libirt_browser.a',
203 '>(tc_lib_dir_irt32)/libpnacl_irt_shim_for_irt.a', 201 '>(tc_lib_dir_irt32)/libpnacl_irt_shim_for_irt.a',
204 '>(tc_lib_dir_irt32)/libshared_memory_support_nacl.a', 202 '>(tc_lib_dir_irt32)/libshared_memory_support_nacl.a',
205 '>(tc_lib_dir_irt32)/libsrpc.a',
206 '>(tc_lib_dir_irt32)/libplatform.a', 203 '>(tc_lib_dir_irt32)/libplatform.a',
207 '>(tc_lib_dir_irt32)/libimc_syscalls.a', 204 '>(tc_lib_dir_irt32)/libimc_syscalls.a',
208 '>(tc_lib_dir_irt32)/libgio.a', 205 '>(tc_lib_dir_irt32)/libgio.a',
209 ], 206 ],
210 }], 207 }],
211 ['target_arch=="arm"', { 208 ['target_arch=="arm"', {
212 'extra_deps_arm': [ 209 'extra_deps_arm': [
213 '>(tc_lib_dir_irt_arm)/libppapi_proxy_nacl.a', 210 '>(tc_lib_dir_irt_arm)/libppapi_proxy_nacl.a',
214 '>(tc_lib_dir_irt_arm)/libppapi_ipc_nacl.a', 211 '>(tc_lib_dir_irt_arm)/libppapi_ipc_nacl.a',
215 '>(tc_lib_dir_irt_arm)/libppapi_shared_nacl.a', 212 '>(tc_lib_dir_irt_arm)/libppapi_shared_nacl.a',
216 '>(tc_lib_dir_irt_arm)/libgles2_implementation_nacl.a', 213 '>(tc_lib_dir_irt_arm)/libgles2_implementation_nacl.a',
217 '>(tc_lib_dir_irt_arm)/libcommand_buffer_client_nacl.a', 214 '>(tc_lib_dir_irt_arm)/libcommand_buffer_client_nacl.a',
218 '>(tc_lib_dir_irt_arm)/libcommand_buffer_common_nacl.a', 215 '>(tc_lib_dir_irt_arm)/libcommand_buffer_common_nacl.a',
219 '>(tc_lib_dir_irt_arm)/libgpu_ipc_nacl.a', 216 '>(tc_lib_dir_irt_arm)/libgpu_ipc_nacl.a',
220 '>(tc_lib_dir_irt_arm)/libtracing_nacl.a', 217 '>(tc_lib_dir_irt_arm)/libtracing_nacl.a',
221 '>(tc_lib_dir_irt_arm)/libgles2_cmd_helper_nacl.a', 218 '>(tc_lib_dir_irt_arm)/libgles2_cmd_helper_nacl.a',
222 '>(tc_lib_dir_irt_arm)/libgles2_utils_nacl.a', 219 '>(tc_lib_dir_irt_arm)/libgles2_utils_nacl.a',
223 '>(tc_lib_dir_irt_arm)/libipc_nacl.a', 220 '>(tc_lib_dir_irt_arm)/libipc_nacl.a',
224 '>(tc_lib_dir_irt_arm)/libbase_nacl.a', 221 '>(tc_lib_dir_irt_arm)/libbase_nacl.a',
225 '>(tc_lib_dir_irt_arm)/libirt_browser.a', 222 '>(tc_lib_dir_irt_arm)/libirt_browser.a',
226 '>(tc_lib_dir_irt_arm)/libpnacl_irt_shim_for_irt.a', 223 '>(tc_lib_dir_irt_arm)/libpnacl_irt_shim_for_irt.a',
227 '>(tc_lib_dir_irt_arm)/libshared_memory_support_nacl.a', 224 '>(tc_lib_dir_irt_arm)/libshared_memory_support_nacl.a',
228 '>(tc_lib_dir_irt_arm)/libsrpc.a',
229 '>(tc_lib_dir_irt_arm)/libplatform.a', 225 '>(tc_lib_dir_irt_arm)/libplatform.a',
230 '>(tc_lib_dir_irt_arm)/libimc_syscalls.a', 226 '>(tc_lib_dir_irt_arm)/libimc_syscalls.a',
231 '>(tc_lib_dir_irt_arm)/libgio.a', 227 '>(tc_lib_dir_irt_arm)/libgio.a',
232 ], 228 ],
233 }], 229 }],
234 ['target_arch=="mipsel"', { 230 ['target_arch=="mipsel"', {
235 'extra_deps_mips': [ 231 'extra_deps_mips': [
236 '>(tc_lib_dir_irt_mips)/libppapi_proxy_nacl.a', 232 '>(tc_lib_dir_irt_mips)/libppapi_proxy_nacl.a',
237 '>(tc_lib_dir_irt_mips)/libppapi_ipc_nacl.a', 233 '>(tc_lib_dir_irt_mips)/libppapi_ipc_nacl.a',
238 '>(tc_lib_dir_irt_mips)/libppapi_shared_nacl.a', 234 '>(tc_lib_dir_irt_mips)/libppapi_shared_nacl.a',
239 '>(tc_lib_dir_irt_mips)/libgles2_implementation_nacl.a', 235 '>(tc_lib_dir_irt_mips)/libgles2_implementation_nacl.a',
240 '>(tc_lib_dir_irt_mips)/libcommand_buffer_client_nacl.a', 236 '>(tc_lib_dir_irt_mips)/libcommand_buffer_client_nacl.a',
241 '>(tc_lib_dir_irt_mips)/libcommand_buffer_common_nacl.a', 237 '>(tc_lib_dir_irt_mips)/libcommand_buffer_common_nacl.a',
242 '>(tc_lib_dir_irt_mips)/libgpu_ipc_nacl.a', 238 '>(tc_lib_dir_irt_mips)/libgpu_ipc_nacl.a',
243 '>(tc_lib_dir_irt_mips)/libtracing_nacl.a', 239 '>(tc_lib_dir_irt_mips)/libtracing_nacl.a',
244 '>(tc_lib_dir_irt_mips)/libgles2_cmd_helper_nacl.a', 240 '>(tc_lib_dir_irt_mips)/libgles2_cmd_helper_nacl.a',
245 '>(tc_lib_dir_irt_mips)/libgles2_utils_nacl.a', 241 '>(tc_lib_dir_irt_mips)/libgles2_utils_nacl.a',
246 '>(tc_lib_dir_irt_mips)/libipc_nacl.a', 242 '>(tc_lib_dir_irt_mips)/libipc_nacl.a',
247 '>(tc_lib_dir_irt_mips)/libbase_nacl.a', 243 '>(tc_lib_dir_irt_mips)/libbase_nacl.a',
248 '>(tc_lib_dir_irt_mips)/libirt_browser.a', 244 '>(tc_lib_dir_irt_mips)/libirt_browser.a',
249 '>(tc_lib_dir_irt_mips)/libpnacl_irt_shim_for_irt.a', 245 '>(tc_lib_dir_irt_mips)/libpnacl_irt_shim_for_irt.a',
250 '>(tc_lib_dir_irt_mips)/libshared_memory_support_nacl.a', 246 '>(tc_lib_dir_irt_mips)/libshared_memory_support_nacl.a',
251 '>(tc_lib_dir_irt_mips)/libsrpc.a',
252 '>(tc_lib_dir_irt_mips)/libplatform.a', 247 '>(tc_lib_dir_irt_mips)/libplatform.a',
253 '>(tc_lib_dir_irt_mips)/libimc_syscalls.a', 248 '>(tc_lib_dir_irt_mips)/libimc_syscalls.a',
254 '>(tc_lib_dir_irt_mips)/libgio.a', 249 '>(tc_lib_dir_irt_mips)/libgio.a',
255 ], 250 ],
256 }], 251 }],
257 ], 252 ],
258 }, 253 },
259 'dependencies': [ 254 'dependencies': [
260 'src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:irt', 255 'src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:irt',
261 '../ppapi_proxy_nacl.gyp:ppapi_proxy_nacl', 256 '../ppapi_proxy_nacl.gyp:ppapi_proxy_nacl',
262 '../ppapi_ipc_nacl.gyp:ppapi_ipc_nacl', 257 '../ppapi_ipc_nacl.gyp:ppapi_ipc_nacl',
263 '../ppapi_shared_nacl.gyp:ppapi_shared_nacl', 258 '../ppapi_shared_nacl.gyp:ppapi_shared_nacl',
264 '../../gpu/command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl', 259 '../../gpu/command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl',
265 '../../gpu/gpu_nacl.gyp:command_buffer_client_nacl', 260 '../../gpu/gpu_nacl.gyp:command_buffer_client_nacl',
266 '../../gpu/gpu_nacl.gyp:command_buffer_common_nacl', 261 '../../gpu/gpu_nacl.gyp:command_buffer_common_nacl',
267 '../../gpu/gpu_nacl.gyp:gles2_implementation_nacl', 262 '../../gpu/gpu_nacl.gyp:gles2_implementation_nacl',
268 '../../gpu/gpu_nacl.gyp:gles2_cmd_helper_nacl', 263 '../../gpu/gpu_nacl.gyp:gles2_cmd_helper_nacl',
269 '../../gpu/gpu_nacl.gyp:gpu_ipc_nacl', 264 '../../gpu/gpu_nacl.gyp:gpu_ipc_nacl',
270 '../../components/tracing_nacl.gyp:tracing_nacl', 265 '../../components/tracing_nacl.gyp:tracing_nacl',
271 '../../ipc/ipc_nacl.gyp:ipc_nacl', 266 '../../ipc/ipc_nacl.gyp:ipc_nacl',
272 '../../base/base_nacl.gyp:base_nacl', 267 '../../base/base_nacl.gyp:base_nacl',
273 '../../media/media_nacl.gyp:shared_memory_support_nacl', 268 '../../media/media_nacl.gyp:shared_memory_support_nacl',
274 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib', 269 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib',
275 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib',
276 '../../native_client/src/shared/platform/platform.gyp:platform_lib', 270 '../../native_client/src/shared/platform/platform.gyp:platform_lib',
277 '../../native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host', 271 '../../native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host',
278 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', 272 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
279 '../../native_client/src/shared/gio/gio.gyp:gio_lib', 273 '../../native_client/src/shared/gio/gio.gyp:gio_lib',
280 ], 274 ],
281 }, 275 },
282 ], 276 ],
283 }], 277 }],
284 ], 278 ],
285 } 279 }
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