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

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

Issue 164373010: Split the PNaCl IRT shim into 3 pieces, and include one piece into IRT. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix up mips Created 6 years, 9 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 '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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 'build_glibc': 0, 112 'build_glibc': 0,
113 'build_newlib': 0, 113 'build_newlib': 0,
114 'build_irt': 1, 114 'build_irt': 1,
115 'include_dirs': [ 115 'include_dirs': [
116 'lib/gl/include', 116 'lib/gl/include',
117 '..', 117 '..',
118 ], 118 ],
119 'link_flags': [ 119 'link_flags': [
120 '-Wl,--start-group', 120 '-Wl,--start-group',
121 '-lirt_browser', 121 '-lirt_browser',
122 '-lpnacl_irt_shim_for_irt',
122 '-lppapi_proxy_untrusted', 123 '-lppapi_proxy_untrusted',
123 '-lppapi_ipc_untrusted', 124 '-lppapi_ipc_untrusted',
124 '-lppapi_shared_untrusted', 125 '-lppapi_shared_untrusted',
125 '-lgles2_implementation_nacl', 126 '-lgles2_implementation_nacl',
126 '-lgles2_cmd_helper_nacl', 127 '-lgles2_cmd_helper_nacl',
127 '-lgles2_utils_nacl', 128 '-lgles2_utils_nacl',
128 '-lcommand_buffer_client_nacl', 129 '-lcommand_buffer_client_nacl',
129 '-lcommand_buffer_common_nacl', 130 '-lcommand_buffer_common_nacl',
130 '-ltracing_untrusted', 131 '-ltracing_untrusted',
131 '-lgpu_ipc_nacl', 132 '-lgpu_ipc_nacl',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 '>(tc_lib_dir_irt64)/libgles2_implementation_nacl.a', 166 '>(tc_lib_dir_irt64)/libgles2_implementation_nacl.a',
166 '>(tc_lib_dir_irt64)/libcommand_buffer_client_nacl.a', 167 '>(tc_lib_dir_irt64)/libcommand_buffer_client_nacl.a',
167 '>(tc_lib_dir_irt64)/libcommand_buffer_common_nacl.a', 168 '>(tc_lib_dir_irt64)/libcommand_buffer_common_nacl.a',
168 '>(tc_lib_dir_irt64)/libgpu_ipc_nacl.a', 169 '>(tc_lib_dir_irt64)/libgpu_ipc_nacl.a',
169 '>(tc_lib_dir_irt64)/libtracing_untrusted.a', 170 '>(tc_lib_dir_irt64)/libtracing_untrusted.a',
170 '>(tc_lib_dir_irt64)/libgles2_cmd_helper_nacl.a', 171 '>(tc_lib_dir_irt64)/libgles2_cmd_helper_nacl.a',
171 '>(tc_lib_dir_irt64)/libgles2_utils_nacl.a', 172 '>(tc_lib_dir_irt64)/libgles2_utils_nacl.a',
172 '>(tc_lib_dir_irt64)/libipc_untrusted.a', 173 '>(tc_lib_dir_irt64)/libipc_untrusted.a',
173 '>(tc_lib_dir_irt64)/libbase_nacl.a', 174 '>(tc_lib_dir_irt64)/libbase_nacl.a',
174 '>(tc_lib_dir_irt64)/libirt_browser.a', 175 '>(tc_lib_dir_irt64)/libirt_browser.a',
176 '>(tc_lib_dir_irt64)/libpnacl_irt_shim_for_irt.a',
175 '>(tc_lib_dir_irt64)/libshared_memory_support_nacl.a', 177 '>(tc_lib_dir_irt64)/libshared_memory_support_nacl.a',
176 '>(tc_lib_dir_irt64)/libsrpc.a', 178 '>(tc_lib_dir_irt64)/libsrpc.a',
177 '>(tc_lib_dir_irt64)/libplatform.a', 179 '>(tc_lib_dir_irt64)/libplatform.a',
178 '>(tc_lib_dir_irt64)/libimc_syscalls.a', 180 '>(tc_lib_dir_irt64)/libimc_syscalls.a',
179 '>(tc_lib_dir_irt64)/libgio.a', 181 '>(tc_lib_dir_irt64)/libgio.a',
180 ], 182 ],
181 'extra_deps_newlib32': [ 183 'extra_deps_newlib32': [
182 '>(tc_lib_dir_irt32)/libppapi_proxy_untrusted.a', 184 '>(tc_lib_dir_irt32)/libppapi_proxy_untrusted.a',
183 '>(tc_lib_dir_irt32)/libppapi_ipc_untrusted.a', 185 '>(tc_lib_dir_irt32)/libppapi_ipc_untrusted.a',
184 '>(tc_lib_dir_irt32)/libppapi_shared_untrusted.a', 186 '>(tc_lib_dir_irt32)/libppapi_shared_untrusted.a',
185 '>(tc_lib_dir_irt32)/libgles2_implementation_nacl.a', 187 '>(tc_lib_dir_irt32)/libgles2_implementation_nacl.a',
186 '>(tc_lib_dir_irt32)/libcommand_buffer_client_nacl.a', 188 '>(tc_lib_dir_irt32)/libcommand_buffer_client_nacl.a',
187 '>(tc_lib_dir_irt32)/libcommand_buffer_common_nacl.a', 189 '>(tc_lib_dir_irt32)/libcommand_buffer_common_nacl.a',
188 '>(tc_lib_dir_irt32)/libgpu_ipc_nacl.a', 190 '>(tc_lib_dir_irt32)/libgpu_ipc_nacl.a',
189 '>(tc_lib_dir_irt32)/libtracing_untrusted.a', 191 '>(tc_lib_dir_irt32)/libtracing_untrusted.a',
190 '>(tc_lib_dir_irt32)/libgles2_cmd_helper_nacl.a', 192 '>(tc_lib_dir_irt32)/libgles2_cmd_helper_nacl.a',
191 '>(tc_lib_dir_irt32)/libgles2_utils_nacl.a', 193 '>(tc_lib_dir_irt32)/libgles2_utils_nacl.a',
192 '>(tc_lib_dir_irt32)/libipc_untrusted.a', 194 '>(tc_lib_dir_irt32)/libipc_untrusted.a',
193 '>(tc_lib_dir_irt32)/libbase_nacl.a', 195 '>(tc_lib_dir_irt32)/libbase_nacl.a',
194 '>(tc_lib_dir_irt32)/libirt_browser.a', 196 '>(tc_lib_dir_irt32)/libirt_browser.a',
197 '>(tc_lib_dir_irt32)/libpnacl_irt_shim_for_irt.a',
195 '>(tc_lib_dir_irt32)/libshared_memory_support_nacl.a', 198 '>(tc_lib_dir_irt32)/libshared_memory_support_nacl.a',
196 '>(tc_lib_dir_irt32)/libsrpc.a', 199 '>(tc_lib_dir_irt32)/libsrpc.a',
197 '>(tc_lib_dir_irt32)/libplatform.a', 200 '>(tc_lib_dir_irt32)/libplatform.a',
198 '>(tc_lib_dir_irt32)/libimc_syscalls.a', 201 '>(tc_lib_dir_irt32)/libimc_syscalls.a',
199 '>(tc_lib_dir_irt32)/libgio.a', 202 '>(tc_lib_dir_irt32)/libgio.a',
200 ], 203 ],
201 }], 204 }],
202 ['target_arch=="arm"', { 205 ['target_arch=="arm"', {
203 'extra_deps_arm': [ 206 'extra_deps_arm': [
204 '>(tc_lib_dir_irt_arm)/libppapi_proxy_untrusted.a', 207 '>(tc_lib_dir_irt_arm)/libppapi_proxy_untrusted.a',
205 '>(tc_lib_dir_irt_arm)/libppapi_ipc_untrusted.a', 208 '>(tc_lib_dir_irt_arm)/libppapi_ipc_untrusted.a',
206 '>(tc_lib_dir_irt_arm)/libppapi_shared_untrusted.a', 209 '>(tc_lib_dir_irt_arm)/libppapi_shared_untrusted.a',
207 '>(tc_lib_dir_irt_arm)/libgles2_implementation_nacl.a', 210 '>(tc_lib_dir_irt_arm)/libgles2_implementation_nacl.a',
208 '>(tc_lib_dir_irt_arm)/libcommand_buffer_client_nacl.a', 211 '>(tc_lib_dir_irt_arm)/libcommand_buffer_client_nacl.a',
209 '>(tc_lib_dir_irt_arm)/libcommand_buffer_common_nacl.a', 212 '>(tc_lib_dir_irt_arm)/libcommand_buffer_common_nacl.a',
210 '>(tc_lib_dir_irt_arm)/libgpu_ipc_nacl.a', 213 '>(tc_lib_dir_irt_arm)/libgpu_ipc_nacl.a',
211 '>(tc_lib_dir_irt_arm)/libtracing_untrusted.a', 214 '>(tc_lib_dir_irt_arm)/libtracing_untrusted.a',
212 '>(tc_lib_dir_irt_arm)/libgles2_cmd_helper_nacl.a', 215 '>(tc_lib_dir_irt_arm)/libgles2_cmd_helper_nacl.a',
213 '>(tc_lib_dir_irt_arm)/libgles2_utils_nacl.a', 216 '>(tc_lib_dir_irt_arm)/libgles2_utils_nacl.a',
214 '>(tc_lib_dir_irt_arm)/libipc_untrusted.a', 217 '>(tc_lib_dir_irt_arm)/libipc_untrusted.a',
215 '>(tc_lib_dir_irt_arm)/libbase_nacl.a', 218 '>(tc_lib_dir_irt_arm)/libbase_nacl.a',
216 '>(tc_lib_dir_irt_arm)/libirt_browser.a', 219 '>(tc_lib_dir_irt_arm)/libirt_browser.a',
220 '>(tc_lib_dir_irt_arm)/libpnacl_irt_shim_for_irt.a',
217 '>(tc_lib_dir_irt_arm)/libshared_memory_support_nacl.a', 221 '>(tc_lib_dir_irt_arm)/libshared_memory_support_nacl.a',
218 '>(tc_lib_dir_irt_arm)/libsrpc.a', 222 '>(tc_lib_dir_irt_arm)/libsrpc.a',
219 '>(tc_lib_dir_irt_arm)/libplatform.a', 223 '>(tc_lib_dir_irt_arm)/libplatform.a',
220 '>(tc_lib_dir_irt_arm)/libimc_syscalls.a', 224 '>(tc_lib_dir_irt_arm)/libimc_syscalls.a',
221 '>(tc_lib_dir_irt_arm)/libgio.a', 225 '>(tc_lib_dir_irt_arm)/libgio.a',
222 ], 226 ],
223 }], 227 }],
224 ['target_arch=="mipsel"', { 228 ['target_arch=="mipsel"', {
225 'extra_deps_mips': [ 229 'extra_deps_mips': [
226 '>(tc_lib_dir_irt_mips)/libppapi_proxy_untrusted.a', 230 '>(tc_lib_dir_irt_mips)/libppapi_proxy_untrusted.a',
227 '>(tc_lib_dir_irt_mips)/libppapi_ipc_untrusted.a', 231 '>(tc_lib_dir_irt_mips)/libppapi_ipc_untrusted.a',
228 '>(tc_lib_dir_irt_mips)/libppapi_shared_untrusted.a', 232 '>(tc_lib_dir_irt_mips)/libppapi_shared_untrusted.a',
229 '>(tc_lib_dir_irt_mips)/libgles2_implementation_untrusted.a', 233 '>(tc_lib_dir_irt_mips)/libgles2_implementation_untrusted.a',
230 '>(tc_lib_dir_irt_mips)/libcommand_buffer_client_untrusted.a', 234 '>(tc_lib_dir_irt_mips)/libcommand_buffer_client_untrusted.a',
231 '>(tc_lib_dir_irt_mips)/libcommand_buffer_common_untrusted.a', 235 '>(tc_lib_dir_irt_mips)/libcommand_buffer_common_untrusted.a',
232 '>(tc_lib_dir_irt_mips)/libgpu_ipc_untrusted.a', 236 '>(tc_lib_dir_irt_mips)/libgpu_ipc_untrusted.a',
233 '>(tc_lib_dir_irt_mips)/libtracing_untrusted.a', 237 '>(tc_lib_dir_irt_mips)/libtracing_untrusted.a',
234 '>(tc_lib_dir_irt_mips)/libgles2_cmd_helper_untrusted.a', 238 '>(tc_lib_dir_irt_mips)/libgles2_cmd_helper_untrusted.a',
235 '>(tc_lib_dir_irt_mips)/libgles2_utils_untrusted.a', 239 '>(tc_lib_dir_irt_mips)/libgles2_utils_untrusted.a',
236 '>(tc_lib_dir_irt_mips)/libipc_untrusted.a', 240 '>(tc_lib_dir_irt_mips)/libipc_untrusted.a',
237 '>(tc_lib_dir_irt_mips)/libbase_nacl.a', 241 '>(tc_lib_dir_irt_mips)/libbase_nacl.a',
238 '>(tc_lib_dir_irt_mips)/libirt_browser.a', 242 '>(tc_lib_dir_irt_mips)/libirt_browser.a',
239 '>(tc_lib_dir_irt_mips)/libshared_memory_support_untrusted.a', 243 '>(tc_lib_dir_irt_mips)/libpnacl_irt_shim_for_irt.a',
244 '>(tc_lib_dir_irt_mips)/libshared_memory_support_nacl.a',
240 '>(tc_lib_dir_irt_mips)/libsrpc.a', 245 '>(tc_lib_dir_irt_mips)/libsrpc.a',
241 '>(tc_lib_dir_irt_mips)/libplatform.a', 246 '>(tc_lib_dir_irt_mips)/libplatform.a',
242 '>(tc_lib_dir_irt_mips)/libimc_syscalls.a', 247 '>(tc_lib_dir_irt_mips)/libimc_syscalls.a',
243 '>(tc_lib_dir_irt_mips)/libgio.a', 248 '>(tc_lib_dir_irt_mips)/libgio.a',
244 ], 249 ],
245 }], 250 }],
246 ], 251 ],
247 }, 252 },
248 'dependencies': [ 253 'dependencies': [
254 'src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:pnacl_irt_shim_for_ irt',
249 '../ppapi_proxy_untrusted.gyp:ppapi_proxy_untrusted', 255 '../ppapi_proxy_untrusted.gyp:ppapi_proxy_untrusted',
250 '../ppapi_ipc_untrusted.gyp:ppapi_ipc_untrusted', 256 '../ppapi_ipc_untrusted.gyp:ppapi_ipc_untrusted',
251 '../ppapi_shared_untrusted.gyp:ppapi_shared_untrusted', 257 '../ppapi_shared_untrusted.gyp:ppapi_shared_untrusted',
252 '../../gpu/command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl', 258 '../../gpu/command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl',
253 '../../gpu/gpu_nacl.gyp:command_buffer_client_nacl', 259 '../../gpu/gpu_nacl.gyp:command_buffer_client_nacl',
254 '../../gpu/gpu_nacl.gyp:command_buffer_common_nacl', 260 '../../gpu/gpu_nacl.gyp:command_buffer_common_nacl',
255 '../../gpu/gpu_nacl.gyp:gles2_implementation_nacl', 261 '../../gpu/gpu_nacl.gyp:gles2_implementation_nacl',
256 '../../gpu/gpu_nacl.gyp:gles2_cmd_helper_nacl', 262 '../../gpu/gpu_nacl.gyp:gles2_cmd_helper_nacl',
257 '../../gpu/gpu_nacl.gyp:gpu_ipc_nacl', 263 '../../gpu/gpu_nacl.gyp:gpu_ipc_nacl',
258 '../../components/tracing_untrusted.gyp:tracing_untrusted', 264 '../../components/tracing_untrusted.gyp:tracing_untrusted',
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 ], 432 ],
427 }, 433 },
428 ], 434 ],
429 }], 435 }],
430 ], 436 ],
431 }, 437 },
432 ], 438 ],
433 }], 439 }],
434 ], 440 ],
435 } 441 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698