summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/chrome_tests.gypi2
-rw-r--r--chrome/test/data/nacl/nacl_test_data.gyp32
-rw-r--r--ppapi/native_client/native_client.gyp48
-rw-r--r--ppapi/ppapi_ipc_nacl.gyp (renamed from ppapi/ppapi_ipc_untrusted.gyp)8
-rw-r--r--ppapi/ppapi_nacl.gyp (renamed from ppapi/ppapi_untrusted.gyp)2
-rw-r--r--ppapi/ppapi_nacl_test_common.gypi2
-rw-r--r--ppapi/ppapi_proxy_nacl.gyp (renamed from ppapi/ppapi_proxy_untrusted.gyp)10
-rw-r--r--ppapi/ppapi_shared_nacl.gyp (renamed from ppapi/ppapi_shared_untrusted.gyp)6
-rw-r--r--third_party/liblouis/liblouis_nacl.gyp2
9 files changed, 56 insertions, 56 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index a1c116f..a0dfa33 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1735,7 +1735,7 @@
'dependencies': [
'test/data/nacl/nacl_test_data.gyp:*',
'../ppapi/native_client/native_client.gyp:nacl_irt',
- '../ppapi/ppapi_untrusted.gyp:ppapi_nacl_tests',
+ '../ppapi/ppapi_nacl.gyp:ppapi_nacl_tests',
'../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_background_keepalive',
'../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_socket'
],
diff --git a/chrome/test/data/nacl/nacl_test_data.gyp b/chrome/test/data/nacl/nacl_test_data.gyp
index cc0f22d..bbeafb3 100644
--- a/chrome/test/data/nacl/nacl_test_data.gyp
+++ b/chrome/test/data/nacl/nacl_test_data.gyp
@@ -156,7 +156,7 @@
'<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
'<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
'<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
- '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+ '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
'ppapi_test_lib',
],
},
@@ -334,7 +334,7 @@
'<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
'<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
'<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
- '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+ '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
'ppapi_test_lib',
],
},
@@ -362,7 +362,7 @@
'<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
'<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
'<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
- '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+ '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
'ppapi_test_lib',
],
},
@@ -390,7 +390,7 @@
'<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
'<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
'<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
- '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+ '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
'ppapi_test_lib',
],
},
@@ -418,7 +418,7 @@
'<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
'<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
'<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
- '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+ '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
'ppapi_test_lib',
],
},
@@ -446,7 +446,7 @@
'<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
'<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
'<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
- '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+ '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
'ppapi_test_lib',
],
},
@@ -476,7 +476,7 @@
'<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
'<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
'<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
- '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+ '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
],
},
{
@@ -513,7 +513,7 @@
},
'dependencies': [
'<(DEPTH)/native_client/tools.gyp:prep_toolchain',
- '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+ '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
'<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
'<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:srpc_lib',
'<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
@@ -558,7 +558,7 @@
},
'dependencies': [
'<(DEPTH)/native_client/tools.gyp:prep_toolchain',
- '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+ '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
'<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
'<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:srpc_lib',
'<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
@@ -605,7 +605,7 @@
},
'dependencies': [
'<(DEPTH)/native_client/tools.gyp:prep_toolchain',
- '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+ '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
'<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
'<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:srpc_lib',
'<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
@@ -646,7 +646,7 @@
},
'dependencies': [
'<(DEPTH)/native_client/tools.gyp:prep_toolchain',
- '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+ '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
'<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
'<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:srpc_lib',
'<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
@@ -796,7 +796,7 @@
'<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_dyncode_private_lib',
'<(DEPTH)/native_client/tools.gyp:prep_toolchain',
'<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
- '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+ '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
'ppapi_test_lib',
],
},
@@ -837,7 +837,7 @@
'<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_exception_private_lib',
'<(DEPTH)/native_client/tools.gyp:prep_toolchain',
'<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
- '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+ '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
'ppapi_test_lib',
],
},
@@ -869,7 +869,7 @@
'<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
'<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
'<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
- '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+ '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
'ppapi_test_lib',
],
},
@@ -900,7 +900,7 @@
'<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
'<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
'<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
- '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+ '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
'ppapi_test_lib',
],
},
@@ -932,7 +932,7 @@
'<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
'<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
'<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
- '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+ '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
'ppapi_test_lib',
],
},
diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp
index 1457019..f865f91 100644
--- a/ppapi/native_client/native_client.gyp
+++ b/ppapi/native_client/native_client.gyp
@@ -119,9 +119,9 @@
'link_flags': [
'-Wl,--start-group',
'-lirt_browser',
- '-lppapi_proxy_untrusted',
- '-lppapi_ipc_untrusted',
- '-lppapi_shared_untrusted',
+ '-lppapi_proxy_nacl',
+ '-lppapi_ipc_nacl',
+ '-lppapi_shared_nacl',
'-lgles2_implementation_nacl',
'-lgles2_cmd_helper_nacl',
'-lgles2_utils_nacl',
@@ -159,9 +159,9 @@
],
['target_arch=="ia32" or target_arch=="x64"', {
'extra_deps_newlib64': [
- '>(tc_lib_dir_irt64)/libppapi_proxy_untrusted.a',
- '>(tc_lib_dir_irt64)/libppapi_ipc_untrusted.a',
- '>(tc_lib_dir_irt64)/libppapi_shared_untrusted.a',
+ '>(tc_lib_dir_irt64)/libppapi_proxy_nacl.a',
+ '>(tc_lib_dir_irt64)/libppapi_ipc_nacl.a',
+ '>(tc_lib_dir_irt64)/libppapi_shared_nacl.a',
'>(tc_lib_dir_irt64)/libgles2_implementation_nacl.a',
'>(tc_lib_dir_irt64)/libcommand_buffer_client_nacl.a',
'>(tc_lib_dir_irt64)/libcommand_buffer_common_nacl.a',
@@ -179,9 +179,9 @@
'>(tc_lib_dir_irt64)/libgio.a',
],
'extra_deps_newlib32': [
- '>(tc_lib_dir_irt32)/libppapi_proxy_untrusted.a',
- '>(tc_lib_dir_irt32)/libppapi_ipc_untrusted.a',
- '>(tc_lib_dir_irt32)/libppapi_shared_untrusted.a',
+ '>(tc_lib_dir_irt32)/libppapi_proxy_nacl.a',
+ '>(tc_lib_dir_irt32)/libppapi_ipc_nacl.a',
+ '>(tc_lib_dir_irt32)/libppapi_shared_nacl.a',
'>(tc_lib_dir_irt32)/libgles2_implementation_nacl.a',
'>(tc_lib_dir_irt32)/libcommand_buffer_client_nacl.a',
'>(tc_lib_dir_irt32)/libcommand_buffer_common_nacl.a',
@@ -201,9 +201,9 @@
}],
['target_arch=="arm"', {
'extra_deps_arm': [
- '>(tc_lib_dir_irt_arm)/libppapi_proxy_untrusted.a',
- '>(tc_lib_dir_irt_arm)/libppapi_ipc_untrusted.a',
- '>(tc_lib_dir_irt_arm)/libppapi_shared_untrusted.a',
+ '>(tc_lib_dir_irt_arm)/libppapi_proxy_nacl.a',
+ '>(tc_lib_dir_irt_arm)/libppapi_ipc_nacl.a',
+ '>(tc_lib_dir_irt_arm)/libppapi_shared_nacl.a',
'>(tc_lib_dir_irt_arm)/libgles2_implementation_nacl.a',
'>(tc_lib_dir_irt_arm)/libcommand_buffer_client_nacl.a',
'>(tc_lib_dir_irt_arm)/libcommand_buffer_common_nacl.a',
@@ -223,20 +223,20 @@
}],
['target_arch=="mipsel"', {
'extra_deps_mips': [
- '>(tc_lib_dir_irt_mips)/libppapi_proxy_untrusted.a',
- '>(tc_lib_dir_irt_mips)/libppapi_ipc_untrusted.a',
- '>(tc_lib_dir_irt_mips)/libppapi_shared_untrusted.a',
- '>(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)/libppapi_proxy_nacl.a',
+ '>(tc_lib_dir_irt_mips)/libppapi_ipc_nacl.a',
+ '>(tc_lib_dir_irt_mips)/libppapi_shared_nacl.a',
+ '>(tc_lib_dir_irt_mips)/libgles2_implementation_nacl.a',
+ '>(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)/libgles2_cmd_helper_untrusted.a',
- '>(tc_lib_dir_irt_mips)/libgles2_utils_untrusted.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',
'>(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)/libshared_memory_support_nacl.a',
'>(tc_lib_dir_irt_mips)/libsrpc.a',
'>(tc_lib_dir_irt_mips)/libplatform.a',
'>(tc_lib_dir_irt_mips)/libimc_syscalls.a',
@@ -246,9 +246,9 @@
],
},
'dependencies': [
- '../ppapi_proxy_untrusted.gyp:ppapi_proxy_untrusted',
- '../ppapi_ipc_untrusted.gyp:ppapi_ipc_untrusted',
- '../ppapi_shared_untrusted.gyp:ppapi_shared_untrusted',
+ '../ppapi_proxy_nacl.gyp:ppapi_proxy_nacl',
+ '../ppapi_ipc_nacl.gyp:ppapi_ipc_nacl',
+ '../ppapi_shared_nacl.gyp:ppapi_shared_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_ipc_untrusted.gyp b/ppapi/ppapi_ipc_nacl.gyp
index cb86e77..ca7d4a3 100644
--- a/ppapi/ppapi_ipc_untrusted.gyp
+++ b/ppapi/ppapi_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,13 +14,13 @@
['disable_nacl==0 and disable_nacl_untrusted==0', {
'targets': [
{
- 'target_name': 'ppapi_ipc_untrusted',
+ 'target_name': 'ppapi_ipc_nacl',
'type': 'none',
'variables': {
'ppapi_ipc_target': 1,
'nacl_win64_target': 0,
'nacl_untrusted_build': 1,
- 'nlib_target': 'libppapi_ipc_untrusted.a',
+ 'nlib_target': 'libppapi_ipc_nacl.a',
'build_glibc': 0,
'build_newlib': 0,
'build_irt': 1,
@@ -33,7 +33,7 @@
'../base/base_nacl.gyp:base_nacl',
'../gpu/gpu_nacl.gyp:gpu_ipc_nacl',
'../ipc/ipc_nacl.gyp:ipc_nacl',
- '../ppapi/ppapi_shared_untrusted.gyp:ppapi_shared_untrusted',
+ '../ppapi/ppapi_shared_nacl.gyp:ppapi_shared_nacl',
'../components/tracing_untrusted.gyp:tracing_untrusted',
],
},
diff --git a/ppapi/ppapi_untrusted.gyp b/ppapi/ppapi_nacl.gyp
index 40f66e2..ca016ed1 100644
--- a/ppapi/ppapi_untrusted.gyp
+++ b/ppapi/ppapi_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.
diff --git a/ppapi/ppapi_nacl_test_common.gypi b/ppapi/ppapi_nacl_test_common.gypi
index 34e61b37..e495914 100644
--- a/ppapi/ppapi_nacl_test_common.gypi
+++ b/ppapi/ppapi_nacl_test_common.gypi
@@ -37,7 +37,7 @@
},
'dependencies': [
'<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib',
- '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+ '<(DEPTH)/ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
'<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
],
'target_conditions': [
diff --git a/ppapi/ppapi_proxy_untrusted.gyp b/ppapi/ppapi_proxy_nacl.gyp
index 11e6db2..24ceadf 100644
--- a/ppapi/ppapi_proxy_untrusted.gyp
+++ b/ppapi/ppapi_proxy_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': 'ppapi_proxy_untrusted',
+ 'target_name': 'ppapi_proxy_nacl',
'type': 'none',
'variables': {
'ppapi_proxy_target': 1,
'nacl_untrusted_build': 1,
- 'nlib_target': 'libppapi_proxy_untrusted.a',
+ 'nlib_target': 'libppapi_proxy_nacl.a',
'build_glibc': 0,
'build_newlib': 0,
'build_irt': 1,
@@ -37,8 +37,8 @@
'../gpu/gpu_nacl.gyp:gles2_cmd_helper_nacl',
'../gpu/gpu_nacl.gyp:gpu_ipc_nacl',
'../ipc/ipc_nacl.gyp:ipc_nacl',
- '../ppapi/ppapi_shared_untrusted.gyp:ppapi_shared_untrusted',
- '../ppapi/ppapi_ipc_untrusted.gyp:ppapi_ipc_untrusted',
+ '../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',
],
diff --git a/ppapi/ppapi_shared_untrusted.gyp b/ppapi/ppapi_shared_nacl.gyp
index 8b5fdd2..fe9c792 100644
--- a/ppapi/ppapi_shared_untrusted.gyp
+++ b/ppapi/ppapi_shared_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,13 +14,13 @@
['disable_nacl==0 and disable_nacl_untrusted==0', {
'targets': [
{
- 'target_name': 'ppapi_shared_untrusted',
+ 'target_name': 'ppapi_shared_nacl',
'type': 'none',
'variables': {
'ppapi_shared_target': 1,
'nacl_win64_target': 0,
'nacl_untrusted_build': 1,
- 'nlib_target': 'libppapi_shared_untrusted.a',
+ 'nlib_target': 'libppapi_shared_nacl.a',
'build_glibc': 0,
'build_newlib': 0,
'build_irt': 1,
diff --git a/third_party/liblouis/liblouis_nacl.gyp b/third_party/liblouis/liblouis_nacl.gyp
index 0721ec5..08915e5 100644
--- a/third_party/liblouis/liblouis_nacl.gyp
+++ b/third_party/liblouis/liblouis_nacl.gyp
@@ -116,7 +116,7 @@
'../../native_client/tools.gyp:prep_toolchain',
'../../native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted',
'../../ppapi/native_client/native_client.gyp:ppapi_lib',
- '../../ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
+ '../../ppapi/ppapi_nacl.gyp:ppapi_cpp_lib',
'../jsoncpp/jsoncpp_nacl.gyp:jsoncpp_nacl',
'liblouis_nacl',
],
generated by cgit v1.1 at 2025-03-12 19:15:55 +0000