| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # |
| 2 # 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 |
| 3 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 4 | 5 |
| 5 { | 6 { |
| 6 'variables': { | |
| 7 'chromium_code': 1, | |
| 8 }, | |
| 9 'includes': [ | 7 'includes': [ |
| 10 '../native_client/build/untrusted.gypi', | 8 '../build/common_untrusted.gypi', |
| 11 ], | 9 ], |
| 12 'conditions': [ | 10 'conditions': [ |
| 13 ['disable_nacl==0 and disable_nacl_untrusted==0', { | 11 ['disable_nacl==0 and disable_nacl_untrusted==0', { |
| 14 'targets': [ | 12 'targets': [ |
| 15 { | 13 { |
| 16 'target_name': 'shared_memory_support_untrusted', | 14 'target_name': 'tracing_untrusted', |
| 17 'type': 'none', | 15 'type': 'none', |
| 18 'variables': { | 16 'defines!': ['CONTENT_IMPLEMENTATION'], |
| 19 'nacl_untrusted_build': 1, | |
| 20 'nlib_target': 'libshared_memory_support_untrusted.a', | |
| 21 'build_glibc': 0, | |
| 22 'build_newlib': 1, | |
| 23 }, | |
| 24 'dependencies': [ | 17 'dependencies': [ |
| 18 '../base/base_untrusted.gyp:base_untrusted', |
| 25 '../native_client/tools.gyp:prep_toolchain', | 19 '../native_client/tools.gyp:prep_toolchain', |
| 26 '../base/base_untrusted.gyp:base_untrusted', | 20 '../ipc/ipc.gyp:ipc', |
| 27 ], | |
| 28 'defines': [ | |
| 29 'MEDIA_IMPLEMENTATION', | |
| 30 ], | 21 ], |
| 31 'include_dirs': [ | 22 'include_dirs': [ |
| 32 '..', | 23 '..', |
| 33 ], | 24 ], |
| 34 'includes': [ | 25 'variables': { |
| 35 'shared_memory_support.gypi', | 26 'nacl_untrusted_build': 1, |
| 36 ], | 27 'nlib_target': 'libtracing_untrusted.a', |
| 28 'build_glibc': 0, |
| 29 'build_newlib': 1, |
| 30 }, |
| 37 'sources': [ | 31 'sources': [ |
| 38 '<@(shared_memory_support_sources)', | 32 'components/tracing/child_trace_message_filter.cc', |
| 33 'components/tracing/child_trace_message_filter.h', |
| 34 'components/tracing/tracing_messages.cc', |
| 35 'components/tracing/tracing_messages.h', |
| 39 ], | 36 ], |
| 40 }, | 37 }, |
| 41 ], | 38 ], |
| 42 }], | 39 }], |
| 43 ], | 40 ], |
| 44 } | 41 } |
| OLD | NEW |