From 754bcf10c30f95690e6eb6fb14911e5d9e9cddd1 Mon Sep 17 00:00:00 2001 From: "sergeyu@chromium.org" Date: Sat, 22 Feb 2014 02:29:50 +0000 Subject: [PATCH] Rename base_untrusted to base_nacl BUG=345453 R=brettw@chromium.org TBR=ben@chromium.org Review URL: https://codereview.chromium.org/174493002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252732 0039d316-1c4b-4281-b951-d872f2087c98 --- base/{base_untrusted.gyp => base_nacl.gyp} | 8 ++++---- components/tracing_untrusted.gyp | 2 +- gpu/command_buffer/command_buffer_nacl.gyp | 2 +- gpu/gpu_nacl.gyp | 10 +++++----- ipc/ipc_untrusted.gyp | 2 +- media/media_nacl.gyp | 2 +- ppapi/native_client/native_client.gyp | 12 ++++++------ ppapi/ppapi_ipc_untrusted.gyp | 2 +- ppapi/ppapi_proxy_untrusted.gyp | 2 +- ppapi/ppapi_shared_untrusted.gyp | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) rename base/{base_untrusted.gyp => base_nacl.gyp} (90%) diff --git a/base/base_untrusted.gyp b/base/base_nacl.gyp similarity index 90% rename from base/base_untrusted.gyp rename to base/base_nacl.gyp index a74766991ec68b..5ef664ce5beac3 100644 --- a/base/base_untrusted.gyp +++ b/base/base_nacl.gyp @@ -14,12 +14,12 @@ ['disable_nacl==0 and disable_nacl_untrusted==0', { 'targets': [ { - 'target_name': 'base_untrusted', + 'target_name': 'base_nacl', 'type': 'none', 'variables': { 'base_target': 1, 'nacl_untrusted_build': 1, - 'nlib_target': 'libbase_untrusted.a', + 'nlib_target': 'libbase_nacl.a', 'build_glibc': 1, 'build_newlib': 1, 'build_irt': 1, @@ -40,12 +40,12 @@ ], }, { - 'target_name': 'base_i18n_untrusted', + 'target_name': 'base_i18n_nacl', 'type': 'none', 'variables': { 'base_i18n_target': 1, 'nacl_untrusted_build': 1, - 'nlib_target': 'libbase_i18n_untrusted.a', + 'nlib_target': 'libbase_i18n_nacl.a', 'build_glibc': 0, 'build_newlib': 1, 'build_irt': 0, diff --git a/components/tracing_untrusted.gyp b/components/tracing_untrusted.gyp index 1991ec28a084c1..99ae413b2d0b10 100644 --- a/components/tracing_untrusted.gyp +++ b/components/tracing_untrusted.gyp @@ -15,7 +15,7 @@ 'type': 'none', 'defines!': ['CONTENT_IMPLEMENTATION'], 'dependencies': [ - '../base/base_untrusted.gyp:base_untrusted', + '../base/base_nacl.gyp:base_nacl', '../native_client/tools.gyp:prep_toolchain', '../ipc/ipc.gyp:ipc', ], diff --git a/gpu/command_buffer/command_buffer_nacl.gyp b/gpu/command_buffer/command_buffer_nacl.gyp index 2f33e381b3a504..aabd1c84a41f85 100644 --- a/gpu/command_buffer/command_buffer_nacl.gyp +++ b/gpu/command_buffer/command_buffer_nacl.gyp @@ -26,7 +26,7 @@ }, 'dependencies': [ '../../native_client/tools.gyp:prep_toolchain', - '../../base/base_untrusted.gyp:base_untrusted', + '../../base/base_nacl.gyp:base_nacl', '../../third_party/khronos/khronos.gyp:khronos_headers', ], }, diff --git a/gpu/gpu_nacl.gyp b/gpu/gpu_nacl.gyp index 5f6fa1f819847c..3d8a1c1656a999 100644 --- a/gpu/gpu_nacl.gyp +++ b/gpu/gpu_nacl.gyp @@ -33,7 +33,7 @@ ], 'dependencies': [ '../native_client/tools.gyp:prep_toolchain', - '../base/base_untrusted.gyp:base_untrusted', + '../base/base_nacl.gyp:base_nacl', '../third_party/khronos/khronos.gyp:khronos_headers', 'command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl', 'gles2_cmd_helper_nacl', @@ -54,7 +54,7 @@ ], 'dependencies': [ '../native_client/tools.gyp:prep_toolchain', - '../base/base_untrusted.gyp:base_untrusted', + '../base/base_nacl.gyp:base_nacl', 'command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl', ], }, @@ -73,7 +73,7 @@ ], 'dependencies': [ '../native_client/tools.gyp:prep_toolchain', - '../base/base_untrusted.gyp:base_untrusted', + '../base/base_nacl.gyp:base_nacl', 'command_buffer_client_nacl', ], }, @@ -92,7 +92,7 @@ ], 'dependencies': [ '../native_client/tools.gyp:prep_toolchain', - '../base/base_untrusted.gyp:base_untrusted', + '../base/base_nacl.gyp:base_nacl', 'command_buffer_common_nacl', ], }, @@ -111,7 +111,7 @@ ], 'dependencies': [ '../native_client/tools.gyp:prep_toolchain', - '../base/base_untrusted.gyp:base_untrusted', + '../base/base_nacl.gyp:base_nacl', 'command_buffer_common_nacl', ], }, diff --git a/ipc/ipc_untrusted.gyp b/ipc/ipc_untrusted.gyp index 7b0c5483faf856..1fa240e80e2e46 100644 --- a/ipc/ipc_untrusted.gyp +++ b/ipc/ipc_untrusted.gyp @@ -26,7 +26,7 @@ }, 'dependencies': [ '<(DEPTH)/native_client/tools.gyp:prep_toolchain', - '../base/base_untrusted.gyp:base_untrusted', + '../base/base_nacl.gyp:base_nacl', ], }, ], diff --git a/media/media_nacl.gyp b/media/media_nacl.gyp index b3f842fe18d293..2dd4bf9863e741 100644 --- a/media/media_nacl.gyp +++ b/media/media_nacl.gyp @@ -24,7 +24,7 @@ }, 'dependencies': [ '../native_client/tools.gyp:prep_toolchain', - '../base/base_untrusted.gyp:base_untrusted', + '../base/base_nacl.gyp:base_nacl', ], 'defines': [ 'MEDIA_IMPLEMENTATION', diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp index f632b8832cd8cd..4d85957dfb4452 100644 --- a/ppapi/native_client/native_client.gyp +++ b/ppapi/native_client/native_client.gyp @@ -130,7 +130,7 @@ '-ltracing_untrusted', '-lgpu_ipc_nacl', '-lipc_untrusted', - '-lbase_untrusted', + '-lbase_nacl', '-lshared_memory_support_nacl', '-lsrpc', '-limc_syscalls', @@ -170,7 +170,7 @@ '>(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)/libbase_untrusted.a', + '>(tc_lib_dir_irt64)/libbase_nacl.a', '>(tc_lib_dir_irt64)/libirt_browser.a', '>(tc_lib_dir_irt64)/libshared_memory_support_nacl.a', '>(tc_lib_dir_irt64)/libsrpc.a', @@ -190,7 +190,7 @@ '>(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)/libbase_untrusted.a', + '>(tc_lib_dir_irt32)/libbase_nacl.a', '>(tc_lib_dir_irt32)/libirt_browser.a', '>(tc_lib_dir_irt32)/libshared_memory_support_nacl.a', '>(tc_lib_dir_irt32)/libsrpc.a', @@ -212,7 +212,7 @@ '>(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)/libbase_untrusted.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', '>(tc_lib_dir_irt_arm)/libsrpc.a', @@ -234,7 +234,7 @@ '>(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)/libbase_untrusted.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', '>(tc_lib_dir_irt_mips)/libsrpc.a', @@ -257,7 +257,7 @@ '../../gpu/gpu_nacl.gyp:gpu_ipc_nacl', '../../components/tracing_untrusted.gyp:tracing_untrusted', '../../ipc/ipc_untrusted.gyp:ipc_untrusted', - '../../base/base_untrusted.gyp:base_untrusted', + '../../base/base_nacl.gyp:base_nacl', '../../media/media_nacl.gyp:shared_memory_support_nacl', '../../native_client/src/untrusted/irt/irt.gyp:irt_browser_lib', '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', diff --git a/ppapi/ppapi_ipc_untrusted.gyp b/ppapi/ppapi_ipc_untrusted.gyp index 4098c5c82137ac..7ea32b8f9851e3 100644 --- a/ppapi/ppapi_ipc_untrusted.gyp +++ b/ppapi/ppapi_ipc_untrusted.gyp @@ -30,7 +30,7 @@ ], 'dependencies': [ '../native_client/tools.gyp:prep_toolchain', - '../base/base_untrusted.gyp:base_untrusted', + '../base/base_nacl.gyp:base_nacl', '../gpu/gpu_nacl.gyp:gpu_ipc_nacl', '../ipc/ipc_untrusted.gyp:ipc_untrusted', '../ppapi/ppapi_shared_untrusted.gyp:ppapi_shared_untrusted', diff --git a/ppapi/ppapi_proxy_untrusted.gyp b/ppapi/ppapi_proxy_untrusted.gyp index 5d03a226077d79..da233ed7e7c5f3 100644 --- a/ppapi/ppapi_proxy_untrusted.gyp +++ b/ppapi/ppapi_proxy_untrusted.gyp @@ -29,7 +29,7 @@ ], 'dependencies': [ '../native_client/tools.gyp:prep_toolchain', - '../base/base_untrusted.gyp:base_untrusted', + '../base/base_nacl.gyp:base_nacl', '../gpu/command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl', '../gpu/gpu_nacl.gyp:command_buffer_client_nacl', '../gpu/gpu_nacl.gyp:command_buffer_common_nacl', diff --git a/ppapi/ppapi_shared_untrusted.gyp b/ppapi/ppapi_shared_untrusted.gyp index d25556d9872f0c..8b5fdd2e229d60 100644 --- a/ppapi/ppapi_shared_untrusted.gyp +++ b/ppapi/ppapi_shared_untrusted.gyp @@ -30,7 +30,7 @@ ], 'dependencies': [ '../native_client/tools.gyp:prep_toolchain', - '../base/base_untrusted.gyp:base_untrusted', + '../base/base_nacl.gyp:base_nacl', '../gpu/command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl', '../gpu/gpu_nacl.gyp:command_buffer_client_nacl', '../gpu/gpu_nacl.gyp:gles2_implementation_nacl',