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

Side by Side Diff: components/tracing_nacl.gyp

Issue 1097153002: NaCl/GYP: remove references to prep_toolchain. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Edit Created 5 years, 8 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 | « components/nacl_nonsfi.gyp ('k') | content/content_nacl_nonsfi.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'includes': [ 7 'includes': [
8 '../build/common_untrusted.gypi', 8 '../build/common_untrusted.gypi',
9 ], 9 ],
10 'conditions': [ 10 'conditions': [
11 ['disable_nacl==0 and disable_nacl_untrusted==0', { 11 ['disable_nacl==0 and disable_nacl_untrusted==0', {
12 'targets': [ 12 'targets': [
13 { 13 {
14 'target_name': 'tracing_nacl', 14 'target_name': 'tracing_nacl',
15 'type': 'none', 15 'type': 'none',
16 'defines!': ['CONTENT_IMPLEMENTATION'], 16 'defines!': ['CONTENT_IMPLEMENTATION'],
17 'dependencies': [ 17 'dependencies': [
18 '../base/base_nacl.gyp:base_nacl', 18 '../base/base_nacl.gyp:base_nacl',
19 '../base/base_nacl.gyp:base_nacl_nonsfi', 19 '../base/base_nacl.gyp:base_nacl_nonsfi',
20 '../ipc/ipc_nacl.gyp:ipc_nacl', 20 '../ipc/ipc_nacl.gyp:ipc_nacl',
21 '../ipc/ipc_nacl.gyp:ipc_nacl_nonsfi', 21 '../ipc/ipc_nacl.gyp:ipc_nacl_nonsfi',
22 '../native_client/tools.gyp:prep_toolchain',
23 ], 22 ],
24 'include_dirs': [ 23 'include_dirs': [
25 '..', 24 '..',
26 ], 25 ],
27 'variables': { 26 'variables': {
28 'nacl_untrusted_build': 1, 27 'nacl_untrusted_build': 1,
29 'nlib_target': 'libtracing_nacl.a', 28 'nlib_target': 'libtracing_nacl.a',
30 'build_glibc': 0, 29 'build_glibc': 0,
31 'build_newlib': 0, 30 'build_newlib': 0,
32 'build_irt': 1, 31 'build_irt': 1,
33 'build_pnacl_newlib': 0, 32 'build_pnacl_newlib': 0,
34 'build_nonsfi_helper': 1, 33 'build_nonsfi_helper': 1,
35 }, 34 },
36 'sources': [ 35 'sources': [
37 'tracing/child_memory_dump_manager_delegate_impl.cc', 36 'tracing/child_memory_dump_manager_delegate_impl.cc',
38 'tracing/child_memory_dump_manager_delegate_impl.h', 37 'tracing/child_memory_dump_manager_delegate_impl.h',
39 'tracing/child_trace_message_filter.cc', 38 'tracing/child_trace_message_filter.cc',
40 'tracing/child_trace_message_filter.h', 39 'tracing/child_trace_message_filter.h',
41 'tracing/tracing_messages.cc', 40 'tracing/tracing_messages.cc',
42 'tracing/tracing_messages.h', 41 'tracing/tracing_messages.h',
43 ], 42 ],
44 }, 43 },
45 ], 44 ],
46 }], 45 }],
47 ], 46 ],
48 } 47 }
OLDNEW
« no previous file with comments | « components/nacl_nonsfi.gyp ('k') | content/content_nacl_nonsfi.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698