summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-26 14:42:22 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-26 14:42:22 +0000
commit260e35b18bb4fe92dc83c1205edd5cb2bef56c65 (patch)
tree71124bb4133eb01627306b0486f440b322ec28e9
parent5bbe65c23a3d25c9c6483ab0ffaefa26f3079860 (diff)
downloadchromium_src-260e35b18bb4fe92dc83c1205edd5cb2bef56c65.zip
chromium_src-260e35b18bb4fe92dc83c1205edd5cb2bef56c65.tar.gz
chromium_src-260e35b18bb4fe92dc83c1205edd5cb2bef56c65.tar.bz2
Rename ipc_untrusted -> ipc_nacl
BUG=345453 Review URL: https://codereview.chromium.org/178473007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253448 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ipc/ipc_nacl.gyp (renamed from ipc/ipc_untrusted.gyp)6
-rw-r--r--ppapi/native_client/native_client.gyp14
-rw-r--r--ppapi/ppapi_ipc_untrusted.gyp2
-rw-r--r--ppapi/ppapi_proxy_untrusted.gyp2
4 files changed, 12 insertions, 12 deletions
diff --git a/ipc/ipc_untrusted.gyp b/ipc/ipc_nacl.gyp
index 1fa240e..3119f46 100644
--- a/ipc/ipc_untrusted.gyp
+++ b/ipc/ipc_nacl.gyp
@@ -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.
@@ -14,12 +14,12 @@
['disable_nacl==0 and disable_nacl_untrusted==0', {
'targets': [
{
- 'target_name': 'ipc_untrusted',
+ 'target_name': 'ipc_nacl',
'type': 'none',
'variables': {
'ipc_target': 1,
'nacl_untrusted_build': 1,
- 'nlib_target': 'libipc_untrusted.a',
+ 'nlib_target': 'libipc_nacl.a',
'build_glibc': 0,
'build_newlib': 0,
'build_irt': 1,
diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp
index 4d85957..f1441f8 100644
--- a/ppapi/native_client/native_client.gyp
+++ b/ppapi/native_client/native_client.gyp
@@ -129,7 +129,7 @@
'-lcommand_buffer_common_nacl',
'-ltracing_untrusted',
'-lgpu_ipc_nacl',
- '-lipc_untrusted',
+ '-lipc_nacl',
'-lbase_nacl',
'-lshared_memory_support_nacl',
'-lsrpc',
@@ -169,7 +169,7 @@
'>(tc_lib_dir_irt64)/libtracing_untrusted.a',
'>(tc_lib_dir_irt64)/libgles2_cmd_helper_nacl.a',
'>(tc_lib_dir_irt64)/libgles2_utils_nacl.a',
- '>(tc_lib_dir_irt64)/libipc_untrusted.a',
+ '>(tc_lib_dir_irt64)/libipc_nacl.a',
'>(tc_lib_dir_irt64)/libbase_nacl.a',
'>(tc_lib_dir_irt64)/libirt_browser.a',
'>(tc_lib_dir_irt64)/libshared_memory_support_nacl.a',
@@ -189,7 +189,7 @@
'>(tc_lib_dir_irt32)/libtracing_untrusted.a',
'>(tc_lib_dir_irt32)/libgles2_cmd_helper_nacl.a',
'>(tc_lib_dir_irt32)/libgles2_utils_nacl.a',
- '>(tc_lib_dir_irt32)/libipc_untrusted.a',
+ '>(tc_lib_dir_irt32)/libipc_nacl.a',
'>(tc_lib_dir_irt32)/libbase_nacl.a',
'>(tc_lib_dir_irt32)/libirt_browser.a',
'>(tc_lib_dir_irt32)/libshared_memory_support_nacl.a',
@@ -211,7 +211,7 @@
'>(tc_lib_dir_irt_arm)/libtracing_untrusted.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_untrusted.a',
+ '>(tc_lib_dir_irt_arm)/libipc_nacl.a',
'>(tc_lib_dir_irt_arm)/libbase_nacl.a',
'>(tc_lib_dir_irt_arm)/libirt_browser.a',
'>(tc_lib_dir_irt_arm)/libshared_memory_support_nacl.a',
@@ -229,11 +229,11 @@
'>(tc_lib_dir_irt_mips)/libgles2_implementation_untrusted.a',
'>(tc_lib_dir_irt_mips)/libcommand_buffer_client_untrusted.a',
'>(tc_lib_dir_irt_mips)/libcommand_buffer_common_untrusted.a',
- '>(tc_lib_dir_irt_mips)/libgpu_ipc_untrusted.a',
+ '>(tc_lib_dir_irt_mips)/libgpu_ipc_nacl.a',
'>(tc_lib_dir_irt_mips)/libtracing_untrusted.a',
'>(tc_lib_dir_irt_mips)/libgles2_cmd_helper_untrusted.a',
'>(tc_lib_dir_irt_mips)/libgles2_utils_untrusted.a',
- '>(tc_lib_dir_irt_mips)/libipc_untrusted.a',
+ '>(tc_lib_dir_irt_mips)/libipc_nacl.a',
'>(tc_lib_dir_irt_mips)/libbase_nacl.a',
'>(tc_lib_dir_irt_mips)/libirt_browser.a',
'>(tc_lib_dir_irt_mips)/libshared_memory_support_untrusted.a',
@@ -256,7 +256,7 @@
'../../gpu/gpu_nacl.gyp:gles2_cmd_helper_nacl',
'../../gpu/gpu_nacl.gyp:gpu_ipc_nacl',
'../../components/tracing_untrusted.gyp:tracing_untrusted',
- '../../ipc/ipc_untrusted.gyp:ipc_untrusted',
+ '../../ipc/ipc_nacl.gyp:ipc_nacl',
'../../base/base_nacl.gyp:base_nacl',
'../../media/media_nacl.gyp:shared_memory_support_nacl',
'../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib',
diff --git a/ppapi/ppapi_ipc_untrusted.gyp b/ppapi/ppapi_ipc_untrusted.gyp
index 7ea32b8..cb86e77 100644
--- a/ppapi/ppapi_ipc_untrusted.gyp
+++ b/ppapi/ppapi_ipc_untrusted.gyp
@@ -32,7 +32,7 @@
'../native_client/tools.gyp:prep_toolchain',
'../base/base_nacl.gyp:base_nacl',
'../gpu/gpu_nacl.gyp:gpu_ipc_nacl',
- '../ipc/ipc_untrusted.gyp:ipc_untrusted',
+ '../ipc/ipc_nacl.gyp:ipc_nacl',
'../ppapi/ppapi_shared_untrusted.gyp:ppapi_shared_untrusted',
'../components/tracing_untrusted.gyp:tracing_untrusted',
],
diff --git a/ppapi/ppapi_proxy_untrusted.gyp b/ppapi/ppapi_proxy_untrusted.gyp
index da233ed..11e6db2 100644
--- a/ppapi/ppapi_proxy_untrusted.gyp
+++ b/ppapi/ppapi_proxy_untrusted.gyp
@@ -36,7 +36,7 @@
'../gpu/gpu_nacl.gyp:gles2_implementation_nacl',
'../gpu/gpu_nacl.gyp:gles2_cmd_helper_nacl',
'../gpu/gpu_nacl.gyp:gpu_ipc_nacl',
- '../ipc/ipc_untrusted.gyp:ipc_untrusted',
+ '../ipc/ipc_nacl.gyp:ipc_nacl',
'../ppapi/ppapi_shared_untrusted.gyp:ppapi_shared_untrusted',
'../ppapi/ppapi_ipc_untrusted.gyp:ppapi_ipc_untrusted',
'../third_party/khronos/khronos.gyp:khronos_headers',