Skip to content

Commit

Permalink
Rename base_untrusted to base_nacl
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
sergeyu@chromium.org committed Feb 22, 2014
1 parent 831414e commit 754bcf1
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 22 deletions.
8 changes: 4 additions & 4 deletions base/base_untrusted.gyp → base/base_nacl.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion components/tracing_untrusted.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
],
Expand Down
2 changes: 1 addition & 1 deletion gpu/command_buffer/command_buffer_nacl.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
],
},
Expand Down
10 changes: 5 additions & 5 deletions gpu/gpu_nacl.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
],
},
Expand All @@ -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',
],
},
Expand All @@ -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',
],
},
Expand All @@ -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',
],
},
Expand Down
2 changes: 1 addition & 1 deletion ipc/ipc_untrusted.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
'dependencies': [
'<(DEPTH)/native_client/tools.gyp:prep_toolchain',
'../base/base_untrusted.gyp:base_untrusted',
'../base/base_nacl.gyp:base_nacl',
],
},
],
Expand Down
2 changes: 1 addition & 1 deletion media/media_nacl.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
12 changes: 6 additions & 6 deletions ppapi/native_client/native_client.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
'-ltracing_untrusted',
'-lgpu_ipc_nacl',
'-lipc_untrusted',
'-lbase_untrusted',
'-lbase_nacl',
'-lshared_memory_support_nacl',
'-lsrpc',
'-limc_syscalls',
Expand Down Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion ppapi/ppapi_ipc_untrusted.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion ppapi/ppapi_proxy_untrusted.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion ppapi/ppapi_shared_untrusted.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit 754bcf1

Please sign in to comment.