Skip to content

Commit

Permalink
Rename tracing_untrusted->tracing_nacl
Browse files Browse the repository at this point in the history
BUG=345453

Review URL: https://codereview.chromium.org/185063002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254628 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
sergeyu@chromium.org committed Mar 4, 2014
1 parent d387f88 commit 6bf3502
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# 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.
Expand All @@ -11,7 +11,7 @@
['disable_nacl==0 and disable_nacl_untrusted==0', {
'targets': [
{
'target_name': 'tracing_untrusted',
'target_name': 'tracing_nacl',
'type': 'none',
'defines!': ['CONTENT_IMPLEMENTATION'],
'dependencies': [
Expand All @@ -24,7 +24,7 @@
],
'variables': {
'nacl_untrusted_build': 1,
'nlib_target': 'libtracing_untrusted.a',
'nlib_target': 'libtracing_nacl.a',
'build_glibc': 0,
'build_newlib': 0,
'build_irt': 1,
Expand Down
12 changes: 6 additions & 6 deletions ppapi/native_client/native_client.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
'-lgles2_utils_nacl',
'-lcommand_buffer_client_nacl',
'-lcommand_buffer_common_nacl',
'-ltracing_untrusted',
'-ltracing_nacl',
'-lgpu_ipc_nacl',
'-lipc_nacl',
'-lbase_nacl',
Expand Down Expand Up @@ -166,7 +166,7 @@
'>(tc_lib_dir_irt64)/libcommand_buffer_client_nacl.a',
'>(tc_lib_dir_irt64)/libcommand_buffer_common_nacl.a',
'>(tc_lib_dir_irt64)/libgpu_ipc_nacl.a',
'>(tc_lib_dir_irt64)/libtracing_untrusted.a',
'>(tc_lib_dir_irt64)/libtracing_nacl.a',
'>(tc_lib_dir_irt64)/libgles2_cmd_helper_nacl.a',
'>(tc_lib_dir_irt64)/libgles2_utils_nacl.a',
'>(tc_lib_dir_irt64)/libipc_nacl.a',
Expand All @@ -186,7 +186,7 @@
'>(tc_lib_dir_irt32)/libcommand_buffer_client_nacl.a',
'>(tc_lib_dir_irt32)/libcommand_buffer_common_nacl.a',
'>(tc_lib_dir_irt32)/libgpu_ipc_nacl.a',
'>(tc_lib_dir_irt32)/libtracing_untrusted.a',
'>(tc_lib_dir_irt32)/libtracing_nacl.a',
'>(tc_lib_dir_irt32)/libgles2_cmd_helper_nacl.a',
'>(tc_lib_dir_irt32)/libgles2_utils_nacl.a',
'>(tc_lib_dir_irt32)/libipc_nacl.a',
Expand All @@ -208,7 +208,7 @@
'>(tc_lib_dir_irt_arm)/libcommand_buffer_client_nacl.a',
'>(tc_lib_dir_irt_arm)/libcommand_buffer_common_nacl.a',
'>(tc_lib_dir_irt_arm)/libgpu_ipc_nacl.a',
'>(tc_lib_dir_irt_arm)/libtracing_untrusted.a',
'>(tc_lib_dir_irt_arm)/libtracing_nacl.a',
'>(tc_lib_dir_irt_arm)/libgles2_cmd_helper_nacl.a',
'>(tc_lib_dir_irt_arm)/libgles2_utils_nacl.a',
'>(tc_lib_dir_irt_arm)/libipc_nacl.a',
Expand All @@ -230,7 +230,7 @@
'>(tc_lib_dir_irt_mips)/libcommand_buffer_client_nacl.a',
'>(tc_lib_dir_irt_mips)/libcommand_buffer_common_nacl.a',
'>(tc_lib_dir_irt_mips)/libgpu_ipc_nacl.a',
'>(tc_lib_dir_irt_mips)/libtracing_untrusted.a',
'>(tc_lib_dir_irt_mips)/libtracing_nacl.a',
'>(tc_lib_dir_irt_mips)/libgles2_cmd_helper_nacl.a',
'>(tc_lib_dir_irt_mips)/libgles2_utils_nacl.a',
'>(tc_lib_dir_irt_mips)/libipc_nacl.a',
Expand All @@ -255,7 +255,7 @@
'../../gpu/gpu_nacl.gyp:gles2_implementation_nacl',
'../../gpu/gpu_nacl.gyp:gles2_cmd_helper_nacl',
'../../gpu/gpu_nacl.gyp:gpu_ipc_nacl',
'../../components/tracing_untrusted.gyp:tracing_untrusted',
'../../components/tracing_nacl.gyp:tracing_nacl',
'../../ipc/ipc_nacl.gyp:ipc_nacl',
'../../base/base_nacl.gyp:base_nacl',
'../../media/media_nacl.gyp:shared_memory_support_nacl',
Expand Down
2 changes: 1 addition & 1 deletion ppapi/ppapi_ipc_nacl.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
'../gpu/gpu_nacl.gyp:gpu_ipc_nacl',
'../ipc/ipc_nacl.gyp:ipc_nacl',
'../ppapi/ppapi_shared_nacl.gyp:ppapi_shared_nacl',
'../components/tracing_untrusted.gyp:tracing_untrusted',
'../components/tracing_nacl.gyp:tracing_nacl',
],
},
],
Expand Down
2 changes: 1 addition & 1 deletion ppapi/ppapi_proxy_nacl.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
'../ppapi/ppapi_shared_nacl.gyp:ppapi_shared_nacl',
'../ppapi/ppapi_ipc_nacl.gyp:ppapi_ipc_nacl',
'../third_party/khronos/khronos.gyp:khronos_headers',
'../components/tracing_untrusted.gyp:tracing_untrusted',
'../components/tracing_nacl.gyp:tracing_nacl',
],
},
],
Expand Down

0 comments on commit 6bf3502

Please sign in to comment.