OLD | NEW |
---|---|
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 'variables': { | 6 'variables': { |
7 'chromium_code': 1, | 7 'chromium_code': 1, |
8 }, | 8 }, |
9 'includes': [ | 9 'includes': [ |
10 '../build/common_untrusted.gypi', | 10 '../build/common_untrusted.gypi', |
11 ], | 11 ], |
12 'conditions': [ | 12 'conditions': [ |
13 ['disable_nacl==0 and disable_nacl_untrusted==0', { | 13 ['disable_nacl==0 and disable_nacl_untrusted==0', { |
14 'targets': [ | 14 'targets': [ |
15 { | 15 { |
16 'target_name': 'content_common_nacl_nonsfi', | 16 'target_name': 'sandbox_nacl_nonsfi', |
17 'type': 'none', | 17 'type': 'none', |
18 'variables': { | 18 'variables': { |
19 'nacl_untrusted_build': 1, | 19 'nacl_untrusted_build': 1, |
20 'nlib_target': 'libcontent_common_nacl_nonsfi.a', | 20 'nlib_target': 'libsandbox_nacl_nonsfi.a', |
21 'build_glibc': 0, | 21 'build_glibc': 0, |
22 'build_newlib': 0, | 22 'build_newlib': 0, |
23 'build_irt': 0, | 23 'build_irt': 0, |
24 'build_pnacl_newlib': 0, | 24 'build_pnacl_newlib': 0, |
25 'build_nonsfi_helper': 1, | 25 'build_nonsfi_helper': 1, |
26 | 26 |
27 'sources': [ | 27 'sources': [ |
28 'common/send_zygote_child_ping_linux.cc', | 28 'linux/services/proc_util.cc', |
29 'public/common/send_zygote_child_ping_linux.h', | 29 'linux/services/thread_helpers.cc', |
30 # TODO(hidehiko): Add sandbox code. | 30 'linux/suid/client/setuid_sandbox_client.cc', |
Mark Seaborn
2015/02/06 20:15:03
So Git regards this file as copied from content/co
mdempsky
2015/02/09 06:12:39
I think the comment may be referring to content/co
hidehiko
2015/03/02 19:16:25
Yes, and some content/public/common files, too.
| |
31 ], | 31 ], |
32 }, | 32 }, |
33 'dependencies': [ | 33 'dependencies': [ |
34 '../base/base_nacl.gyp:base_nacl_nonsfi', | 34 '../base/base_nacl.gyp:base_nacl_nonsfi', |
35 '../native_client/tools.gyp:prep_toolchain', | 35 '../native_client/tools.gyp:prep_toolchain', |
36 ], | 36 ], |
37 }, | 37 }, |
38 ], | 38 ], |
39 }], | 39 }], |
40 ], | 40 ], |
41 } | 41 } |
OLD | NEW |