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

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

Issue 1279133006: Removed unused mojo_nacl code and GYP targets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: - -l Created 5 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
« no previous file with comments | « ppapi/nacl_irt/DEPS ('k') | 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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 'build_newlib': 0, 126 'build_newlib': 0,
127 'build_irt': 1, 127 'build_irt': 1,
128 'include_dirs': [ 128 'include_dirs': [
129 '..', 129 '..',
130 ], 130 ],
131 'link_flags': [ 131 'link_flags': [
132 '-Wl,--start-group', 132 '-Wl,--start-group',
133 '-lirt_browser', 133 '-lirt_browser',
134 '-lpnacl_irt_shim_for_irt', 134 '-lpnacl_irt_shim_for_irt',
135 '-lppapi_proxy_nacl', 135 '-lppapi_proxy_nacl',
136 '-lmojo_irt',
137 '-lppapi_ipc_nacl', 136 '-lppapi_ipc_nacl',
138 '-lppapi_shared_nacl', 137 '-lppapi_shared_nacl',
139 '-lgles2_implementation_nacl', 138 '-lgles2_implementation_nacl',
140 '-lgles2_cmd_helper_nacl', 139 '-lgles2_cmd_helper_nacl',
141 '-lgles2_utils_nacl', 140 '-lgles2_utils_nacl',
142 '-lcommand_buffer_client_nacl', 141 '-lcommand_buffer_client_nacl',
143 '-lcommand_buffer_common_nacl', 142 '-lcommand_buffer_common_nacl',
144 '-ltracing_nacl', 143 '-ltracing_nacl',
145 '-lgpu_ipc_nacl', 144 '-lgpu_ipc_nacl',
146 '-lipc_nacl', 145 '-lipc_nacl',
(...skipping 20 matching lines...) Expand all
167 } 166 }
168 ], 167 ],
169 ['target_arch=="x64"', 168 ['target_arch=="x64"',
170 { 169 {
171 'enable_x86_32': 0 170 'enable_x86_32': 0
172 } 171 }
173 ], 172 ],
174 ['target_arch=="ia32" or target_arch=="x64"', { 173 ['target_arch=="ia32" or target_arch=="x64"', {
175 'extra_deps_newlib64': [ 174 'extra_deps_newlib64': [
176 '>(tc_lib_dir_irt64)/libppapi_proxy_nacl.a', 175 '>(tc_lib_dir_irt64)/libppapi_proxy_nacl.a',
177 '>(tc_lib_dir_irt64)/libmojo_irt.a',
178 '>(tc_lib_dir_irt64)/libppapi_ipc_nacl.a', 176 '>(tc_lib_dir_irt64)/libppapi_ipc_nacl.a',
179 '>(tc_lib_dir_irt64)/libppapi_shared_nacl.a', 177 '>(tc_lib_dir_irt64)/libppapi_shared_nacl.a',
180 '>(tc_lib_dir_irt64)/libgles2_implementation_nacl.a', 178 '>(tc_lib_dir_irt64)/libgles2_implementation_nacl.a',
181 '>(tc_lib_dir_irt64)/libcommand_buffer_client_nacl.a', 179 '>(tc_lib_dir_irt64)/libcommand_buffer_client_nacl.a',
182 '>(tc_lib_dir_irt64)/libcommand_buffer_common_nacl.a', 180 '>(tc_lib_dir_irt64)/libcommand_buffer_common_nacl.a',
183 '>(tc_lib_dir_irt64)/libgpu_ipc_nacl.a', 181 '>(tc_lib_dir_irt64)/libgpu_ipc_nacl.a',
184 '>(tc_lib_dir_irt64)/libtracing_nacl.a', 182 '>(tc_lib_dir_irt64)/libtracing_nacl.a',
185 '>(tc_lib_dir_irt64)/libgles2_cmd_helper_nacl.a', 183 '>(tc_lib_dir_irt64)/libgles2_cmd_helper_nacl.a',
186 '>(tc_lib_dir_irt64)/libgles2_utils_nacl.a', 184 '>(tc_lib_dir_irt64)/libgles2_utils_nacl.a',
187 '>(tc_lib_dir_irt64)/libipc_nacl.a', 185 '>(tc_lib_dir_irt64)/libipc_nacl.a',
188 '>(tc_lib_dir_irt64)/libbase_nacl.a', 186 '>(tc_lib_dir_irt64)/libbase_nacl.a',
189 '>(tc_lib_dir_irt64)/libirt_browser.a', 187 '>(tc_lib_dir_irt64)/libirt_browser.a',
190 '>(tc_lib_dir_irt64)/libpnacl_irt_shim_for_irt.a', 188 '>(tc_lib_dir_irt64)/libpnacl_irt_shim_for_irt.a',
191 '>(tc_lib_dir_irt64)/libshared_memory_support_nacl.a', 189 '>(tc_lib_dir_irt64)/libshared_memory_support_nacl.a',
192 '>(tc_lib_dir_irt64)/libsrpc.a', 190 '>(tc_lib_dir_irt64)/libsrpc.a',
193 '>(tc_lib_dir_irt64)/libplatform.a', 191 '>(tc_lib_dir_irt64)/libplatform.a',
194 '>(tc_lib_dir_irt64)/libimc_syscalls.a', 192 '>(tc_lib_dir_irt64)/libimc_syscalls.a',
195 '>(tc_lib_dir_irt64)/libgio.a', 193 '>(tc_lib_dir_irt64)/libgio.a',
196 ], 194 ],
197 'extra_deps_newlib32': [ 195 'extra_deps_newlib32': [
198 '>(tc_lib_dir_irt32)/libppapi_proxy_nacl.a', 196 '>(tc_lib_dir_irt32)/libppapi_proxy_nacl.a',
199 '>(tc_lib_dir_irt32)/libmojo_irt.a',
200 '>(tc_lib_dir_irt32)/libppapi_ipc_nacl.a', 197 '>(tc_lib_dir_irt32)/libppapi_ipc_nacl.a',
201 '>(tc_lib_dir_irt32)/libppapi_shared_nacl.a', 198 '>(tc_lib_dir_irt32)/libppapi_shared_nacl.a',
202 '>(tc_lib_dir_irt32)/libgles2_implementation_nacl.a', 199 '>(tc_lib_dir_irt32)/libgles2_implementation_nacl.a',
203 '>(tc_lib_dir_irt32)/libcommand_buffer_client_nacl.a', 200 '>(tc_lib_dir_irt32)/libcommand_buffer_client_nacl.a',
204 '>(tc_lib_dir_irt32)/libcommand_buffer_common_nacl.a', 201 '>(tc_lib_dir_irt32)/libcommand_buffer_common_nacl.a',
205 '>(tc_lib_dir_irt32)/libgpu_ipc_nacl.a', 202 '>(tc_lib_dir_irt32)/libgpu_ipc_nacl.a',
206 '>(tc_lib_dir_irt32)/libtracing_nacl.a', 203 '>(tc_lib_dir_irt32)/libtracing_nacl.a',
207 '>(tc_lib_dir_irt32)/libgles2_cmd_helper_nacl.a', 204 '>(tc_lib_dir_irt32)/libgles2_cmd_helper_nacl.a',
208 '>(tc_lib_dir_irt32)/libgles2_utils_nacl.a', 205 '>(tc_lib_dir_irt32)/libgles2_utils_nacl.a',
209 '>(tc_lib_dir_irt32)/libipc_nacl.a', 206 '>(tc_lib_dir_irt32)/libipc_nacl.a',
210 '>(tc_lib_dir_irt32)/libbase_nacl.a', 207 '>(tc_lib_dir_irt32)/libbase_nacl.a',
211 '>(tc_lib_dir_irt32)/libirt_browser.a', 208 '>(tc_lib_dir_irt32)/libirt_browser.a',
212 '>(tc_lib_dir_irt32)/libpnacl_irt_shim_for_irt.a', 209 '>(tc_lib_dir_irt32)/libpnacl_irt_shim_for_irt.a',
213 '>(tc_lib_dir_irt32)/libshared_memory_support_nacl.a', 210 '>(tc_lib_dir_irt32)/libshared_memory_support_nacl.a',
214 '>(tc_lib_dir_irt32)/libsrpc.a', 211 '>(tc_lib_dir_irt32)/libsrpc.a',
215 '>(tc_lib_dir_irt32)/libplatform.a', 212 '>(tc_lib_dir_irt32)/libplatform.a',
216 '>(tc_lib_dir_irt32)/libimc_syscalls.a', 213 '>(tc_lib_dir_irt32)/libimc_syscalls.a',
217 '>(tc_lib_dir_irt32)/libgio.a', 214 '>(tc_lib_dir_irt32)/libgio.a',
218 ], 215 ],
219 }], 216 }],
220 ['target_arch=="arm"', { 217 ['target_arch=="arm"', {
221 'extra_deps_arm': [ 218 'extra_deps_arm': [
222 '>(tc_lib_dir_irt_arm)/libppapi_proxy_nacl.a', 219 '>(tc_lib_dir_irt_arm)/libppapi_proxy_nacl.a',
223 '>(tc_lib_dir_irt_arm)/libmojo_irt.a',
224 '>(tc_lib_dir_irt_arm)/libppapi_ipc_nacl.a', 220 '>(tc_lib_dir_irt_arm)/libppapi_ipc_nacl.a',
225 '>(tc_lib_dir_irt_arm)/libppapi_shared_nacl.a', 221 '>(tc_lib_dir_irt_arm)/libppapi_shared_nacl.a',
226 '>(tc_lib_dir_irt_arm)/libgles2_implementation_nacl.a', 222 '>(tc_lib_dir_irt_arm)/libgles2_implementation_nacl.a',
227 '>(tc_lib_dir_irt_arm)/libcommand_buffer_client_nacl.a', 223 '>(tc_lib_dir_irt_arm)/libcommand_buffer_client_nacl.a',
228 '>(tc_lib_dir_irt_arm)/libcommand_buffer_common_nacl.a', 224 '>(tc_lib_dir_irt_arm)/libcommand_buffer_common_nacl.a',
229 '>(tc_lib_dir_irt_arm)/libgpu_ipc_nacl.a', 225 '>(tc_lib_dir_irt_arm)/libgpu_ipc_nacl.a',
230 '>(tc_lib_dir_irt_arm)/libtracing_nacl.a', 226 '>(tc_lib_dir_irt_arm)/libtracing_nacl.a',
231 '>(tc_lib_dir_irt_arm)/libgles2_cmd_helper_nacl.a', 227 '>(tc_lib_dir_irt_arm)/libgles2_cmd_helper_nacl.a',
232 '>(tc_lib_dir_irt_arm)/libgles2_utils_nacl.a', 228 '>(tc_lib_dir_irt_arm)/libgles2_utils_nacl.a',
233 '>(tc_lib_dir_irt_arm)/libipc_nacl.a', 229 '>(tc_lib_dir_irt_arm)/libipc_nacl.a',
234 '>(tc_lib_dir_irt_arm)/libbase_nacl.a', 230 '>(tc_lib_dir_irt_arm)/libbase_nacl.a',
235 '>(tc_lib_dir_irt_arm)/libirt_browser.a', 231 '>(tc_lib_dir_irt_arm)/libirt_browser.a',
236 '>(tc_lib_dir_irt_arm)/libpnacl_irt_shim_for_irt.a', 232 '>(tc_lib_dir_irt_arm)/libpnacl_irt_shim_for_irt.a',
237 '>(tc_lib_dir_irt_arm)/libshared_memory_support_nacl.a', 233 '>(tc_lib_dir_irt_arm)/libshared_memory_support_nacl.a',
238 '>(tc_lib_dir_irt_arm)/libsrpc.a', 234 '>(tc_lib_dir_irt_arm)/libsrpc.a',
239 '>(tc_lib_dir_irt_arm)/libplatform.a', 235 '>(tc_lib_dir_irt_arm)/libplatform.a',
240 '>(tc_lib_dir_irt_arm)/libimc_syscalls.a', 236 '>(tc_lib_dir_irt_arm)/libimc_syscalls.a',
241 '>(tc_lib_dir_irt_arm)/libgio.a', 237 '>(tc_lib_dir_irt_arm)/libgio.a',
242 ], 238 ],
243 }], 239 }],
244 ['target_arch=="mipsel"', { 240 ['target_arch=="mipsel"', {
245 'extra_deps_mips': [ 241 'extra_deps_mips': [
246 '>(tc_lib_dir_irt_mips)/libppapi_proxy_nacl.a', 242 '>(tc_lib_dir_irt_mips)/libppapi_proxy_nacl.a',
247 '>(tc_lib_dir_irt_mips)/libmojo_irt.a',
248 '>(tc_lib_dir_irt_mips)/libppapi_ipc_nacl.a', 243 '>(tc_lib_dir_irt_mips)/libppapi_ipc_nacl.a',
249 '>(tc_lib_dir_irt_mips)/libppapi_shared_nacl.a', 244 '>(tc_lib_dir_irt_mips)/libppapi_shared_nacl.a',
250 '>(tc_lib_dir_irt_mips)/libgles2_implementation_nacl.a', 245 '>(tc_lib_dir_irt_mips)/libgles2_implementation_nacl.a',
251 '>(tc_lib_dir_irt_mips)/libcommand_buffer_client_nacl.a', 246 '>(tc_lib_dir_irt_mips)/libcommand_buffer_client_nacl.a',
252 '>(tc_lib_dir_irt_mips)/libcommand_buffer_common_nacl.a', 247 '>(tc_lib_dir_irt_mips)/libcommand_buffer_common_nacl.a',
253 '>(tc_lib_dir_irt_mips)/libgpu_ipc_nacl.a', 248 '>(tc_lib_dir_irt_mips)/libgpu_ipc_nacl.a',
254 '>(tc_lib_dir_irt_mips)/libtracing_nacl.a', 249 '>(tc_lib_dir_irt_mips)/libtracing_nacl.a',
255 '>(tc_lib_dir_irt_mips)/libgles2_cmd_helper_nacl.a', 250 '>(tc_lib_dir_irt_mips)/libgles2_cmd_helper_nacl.a',
256 '>(tc_lib_dir_irt_mips)/libgles2_utils_nacl.a', 251 '>(tc_lib_dir_irt_mips)/libgles2_utils_nacl.a',
257 '>(tc_lib_dir_irt_mips)/libipc_nacl.a', 252 '>(tc_lib_dir_irt_mips)/libipc_nacl.a',
(...skipping 17 matching lines...) Expand all
275 '../../gpu/command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl', 270 '../../gpu/command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl',
276 '../../gpu/gpu_nacl.gyp:command_buffer_client_nacl', 271 '../../gpu/gpu_nacl.gyp:command_buffer_client_nacl',
277 '../../gpu/gpu_nacl.gyp:command_buffer_common_nacl', 272 '../../gpu/gpu_nacl.gyp:command_buffer_common_nacl',
278 '../../gpu/gpu_nacl.gyp:gles2_implementation_nacl', 273 '../../gpu/gpu_nacl.gyp:gles2_implementation_nacl',
279 '../../gpu/gpu_nacl.gyp:gles2_cmd_helper_nacl', 274 '../../gpu/gpu_nacl.gyp:gles2_cmd_helper_nacl',
280 '../../gpu/gpu_nacl.gyp:gpu_ipc_nacl', 275 '../../gpu/gpu_nacl.gyp:gpu_ipc_nacl',
281 '../../components/tracing_nacl.gyp:tracing_nacl', 276 '../../components/tracing_nacl.gyp:tracing_nacl',
282 '../../ipc/ipc_nacl.gyp:ipc_nacl', 277 '../../ipc/ipc_nacl.gyp:ipc_nacl',
283 '../../base/base_nacl.gyp:base_nacl', 278 '../../base/base_nacl.gyp:base_nacl',
284 '../../media/media_nacl.gyp:shared_memory_support_nacl', 279 '../../media/media_nacl.gyp:shared_memory_support_nacl',
285 '../../mojo/mojo_nacl_untrusted.gyp:libmojo_irt',
286 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib', 280 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib',
287 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', 281 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib',
288 '../../native_client/src/shared/platform/platform.gyp:platform_lib', 282 '../../native_client/src/shared/platform/platform.gyp:platform_lib',
289 '../../native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host', 283 '../../native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host',
290 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', 284 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
291 '../../native_client/src/shared/gio/gio.gyp:gio_lib', 285 '../../native_client/src/shared/gio/gio.gyp:gio_lib',
292 ], 286 ],
293 }, 287 },
294 ], 288 ],
295 }], 289 }],
296 ], 290 ],
297 } 291 }
OLDNEW
« no previous file with comments | « ppapi/nacl_irt/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698