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

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

Issue 139803011: tls_edit added as dependency to nacl_irt (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added back in tls_edit rules, we should only add tls_edit dependency in this CL Created 6 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 | Annotate | Revision Log
« 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 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 '../../gpu/gpu_untrusted.gyp:gles2_implementation_untrusted', 222 '../../gpu/gpu_untrusted.gyp:gles2_implementation_untrusted',
223 '../../gpu/gpu_untrusted.gyp:gles2_cmd_helper_untrusted', 223 '../../gpu/gpu_untrusted.gyp:gles2_cmd_helper_untrusted',
224 '../../gpu/gpu_untrusted.gyp:gpu_ipc_untrusted', 224 '../../gpu/gpu_untrusted.gyp:gpu_ipc_untrusted',
225 '../../components/tracing_untrusted.gyp:tracing_untrusted', 225 '../../components/tracing_untrusted.gyp:tracing_untrusted',
226 '../../ipc/ipc_untrusted.gyp:ipc_untrusted', 226 '../../ipc/ipc_untrusted.gyp:ipc_untrusted',
227 '../../base/base_untrusted.gyp:base_untrusted', 227 '../../base/base_untrusted.gyp:base_untrusted',
228 '../../media/media_untrusted.gyp:shared_memory_support_untrusted', 228 '../../media/media_untrusted.gyp:shared_memory_support_untrusted',
229 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib', 229 '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib',
230 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', 230 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib',
231 '../../native_client/src/shared/platform/platform.gyp:platform_lib', 231 '../../native_client/src/shared/platform/platform.gyp:platform_lib',
232 '../../native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host',
232 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', 233 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
233 '../../native_client/src/shared/gio/gio.gyp:gio_lib', 234 '../../native_client/src/shared/gio/gio.gyp:gio_lib',
234 ], 235 ],
235 }, 236 },
236 { 237 {
237 'target_name': 'nacl_irt', 238 'target_name': 'nacl_irt',
238 'type': 'none', 239 'type': 'none',
239 'dependencies': [ 240 'dependencies': [
240 '../../native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host', 241 '../../native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host',
241 'nacl_irt_raw' 242 'nacl_irt_raw'
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 ], 355 ],
355 }, 356 },
356 ], 357 ],
357 }], 358 }],
358 ], 359 ],
359 }, 360 },
360 ], 361 ],
361 }], 362 }],
362 ], 363 ],
363 } 364 }
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