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

Side by Side Diff: components/tracing_nacl.gyp

Issue 650593003: Non-SFI mode: build tracing_nacl library for nacl_helper_nonsfi. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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') | 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 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',
Mark Seaborn 2014/10/24 18:02:49 Technically you don't need to list any library dep
hidehiko 2014/10/27 05:10:12 Admittedly, compile order does not help the binary
20 '../ipc/ipc_nacl.gyp:ipc_nacl',
hidehiko 2014/10/24 06:22:53 FYI: Fixed the dependency correctly.
21 '../ipc/ipc_nacl.gyp:ipc_nacl_nonsfi',
19 '../native_client/tools.gyp:prep_toolchain', 22 '../native_client/tools.gyp:prep_toolchain',
20 '../ipc/ipc.gyp:ipc',
21 ], 23 ],
22 'include_dirs': [ 24 'include_dirs': [
23 '..', 25 '..',
24 ], 26 ],
25 'variables': { 27 'variables': {
26 'nacl_untrusted_build': 1, 28 'nacl_untrusted_build': 1,
27 'nlib_target': 'libtracing_nacl.a', 29 'nlib_target': 'libtracing_nacl.a',
28 'build_glibc': 0, 30 'build_glibc': 0,
29 'build_newlib': 0, 31 'build_newlib': 0,
30 'build_irt': 1, 32 'build_irt': 1,
33 'build_pnacl_newlib': 0,
Mark Seaborn 2014/10/24 18:02:49 I assume you've checked that no-one is using the p
hidehiko 2014/10/27 05:10:12 Yes, no one use it.
34 'build_nonsfi_helper': 1,
31 }, 35 },
32 'sources': [ 36 'sources': [
33 'tracing/child_trace_message_filter.cc', 37 'tracing/child_trace_message_filter.cc',
34 'tracing/child_trace_message_filter.h', 38 'tracing/child_trace_message_filter.h',
35 'tracing/tracing_messages.cc', 39 'tracing/tracing_messages.cc',
36 'tracing/tracing_messages.h', 40 'tracing/tracing_messages.h',
37 ], 41 ],
38 }, 42 },
39 ], 43 ],
40 }], 44 }],
41 ], 45 ],
42 } 46 }
OLDNEW
« no previous file with comments | « components/nacl_nonsfi.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698