| Index: content/content_nacl_nonsfi.gyp
|
| diff --git a/components/tracing_nacl.gyp b/content/content_nacl_nonsfi.gyp
|
| similarity index 55%
|
| copy from components/tracing_nacl.gyp
|
| copy to content/content_nacl_nonsfi.gyp
|
| index 144117f99b78095e2a68609ebf0f74dc296e08db..28b44e380d3d5fa2c1056ee096fa5e2aee1d5557 100644
|
| --- a/components/tracing_nacl.gyp
|
| +++ b/content/content_nacl_nonsfi.gyp
|
| @@ -1,9 +1,11 @@
|
| # Copyright 2014 The Chromium Authors. All rights reserved.
|
| -#
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| {
|
| + 'variables': {
|
| + 'chromium_code': 1,
|
| + },
|
| 'includes': [
|
| '../build/common_untrusted.gypi',
|
| ],
|
| @@ -11,33 +13,26 @@
|
| ['disable_nacl==0 and disable_nacl_untrusted==0', {
|
| 'targets': [
|
| {
|
| - 'target_name': 'tracing_nacl',
|
| + 'target_name': 'content_common_nacl_nonsfi',
|
| 'type': 'none',
|
| - 'defines!': ['CONTENT_IMPLEMENTATION'],
|
| - 'dependencies': [
|
| - '../base/base_nacl.gyp:base_nacl',
|
| - '../base/base_nacl.gyp:base_nacl_nonsfi',
|
| - '../ipc/ipc_nacl.gyp:ipc_nacl',
|
| - '../ipc/ipc_nacl.gyp:ipc_nacl_nonsfi',
|
| - '../native_client/tools.gyp:prep_toolchain',
|
| - ],
|
| - 'include_dirs': [
|
| - '..',
|
| - ],
|
| 'variables': {
|
| 'nacl_untrusted_build': 1,
|
| - 'nlib_target': 'libtracing_nacl.a',
|
| + 'nlib_target': 'libcontent_common_nacl_nonsfi.a',
|
| 'build_glibc': 0,
|
| 'build_newlib': 0,
|
| - 'build_irt': 1,
|
| + 'build_irt': 0,
|
| 'build_pnacl_newlib': 0,
|
| 'build_nonsfi_helper': 1,
|
| +
|
| + 'sources': [
|
| + 'common/send_zygote_child_ping_linux.cc',
|
| + 'public/common/send_zygote_child_ping_linux.h',
|
| + # TODO(hidehiko): Add sandbox code.
|
| + ],
|
| },
|
| - 'sources': [
|
| - 'tracing/child_trace_message_filter.cc',
|
| - 'tracing/child_trace_message_filter.h',
|
| - 'tracing/tracing_messages.cc',
|
| - 'tracing/tracing_messages.h',
|
| + 'dependencies': [
|
| + '../base/base_nacl.gyp:base_nacl_nonsfi',
|
| + '../native_client/tools.gyp:prep_toolchain',
|
| ],
|
| },
|
| ],
|
|
|