| Index: content/content_components_tracing_untrusted.gyp
|
| diff --git a/media/media_untrusted.gyp b/content/content_components_tracing_untrusted.gyp
|
| similarity index 61%
|
| copy from media/media_untrusted.gyp
|
| copy to content/content_components_tracing_untrusted.gyp
|
| index 4abbe5666609a09f87da88bb73a0990ae69efd54..701d9f3ddb702babdff54e560b0241bb44d6e39e 100644
|
| --- a/media/media_untrusted.gyp
|
| +++ b/content/content_components_tracing_untrusted.gyp
|
| @@ -1,41 +1,38 @@
|
| # Copyright (c) 2012 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': [
|
| - '../native_client/build/untrusted.gypi',
|
| + '../build/common_untrusted.gypi',
|
| ],
|
| 'conditions': [
|
| ['disable_nacl==0 and disable_nacl_untrusted==0', {
|
| 'targets': [
|
| {
|
| - 'target_name': 'shared_memory_support_untrusted',
|
| + 'target_name': 'tracing_untrusted',
|
| 'type': 'none',
|
| - 'variables': {
|
| - 'nacl_untrusted_build': 1,
|
| - 'nlib_target': 'libshared_memory_support_untrusted.a',
|
| - 'build_glibc': 0,
|
| - 'build_newlib': 1,
|
| - },
|
| + 'defines!': ['CONTENT_IMPLEMENTATION'],
|
| 'dependencies': [
|
| - '../native_client/tools.gyp:prep_toolchain',
|
| '../base/base_untrusted.gyp:base_untrusted',
|
| - ],
|
| - 'defines': [
|
| - 'MEDIA_IMPLEMENTATION',
|
| + '../native_client/tools.gyp:prep_toolchain',
|
| + '../ipc/ipc.gyp:ipc',
|
| ],
|
| 'include_dirs': [
|
| '..',
|
| ],
|
| - 'includes': [
|
| - 'shared_memory_support.gypi',
|
| - ],
|
| + 'variables': {
|
| + 'nacl_untrusted_build': 1,
|
| + 'nlib_target': 'libtracing_untrusted.a',
|
| + 'build_glibc': 0,
|
| + 'build_newlib': 1,
|
| + },
|
| 'sources': [
|
| - '<@(shared_memory_support_sources)',
|
| + 'components/tracing/child_trace_message_filter.cc',
|
| + 'components/tracing/child_trace_message_filter.h',
|
| + 'components/tracing/tracing_messages.cc',
|
| + 'components/tracing/tracing_messages.h',
|
| ],
|
| },
|
| ],
|
|
|