Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(210)

Unified Diff: gpu/gpu_nacl.gyp

Issue 649183005: Non-SFI Mode: Build gpu/ libraries by PNaCl toolchain for nacl_helper_nonsfi. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/command_buffer_nacl.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/gpu_nacl.gyp
diff --git a/gpu/gpu_nacl.gyp b/gpu/gpu_nacl.gyp
index 3d8a1c1656a999514e7ff17d90b8a0060503adc5..23b21727b3db2c57d3828ed24fde0db42621e0d6 100644
--- a/gpu/gpu_nacl.gyp
+++ b/gpu/gpu_nacl.gyp
@@ -13,7 +13,7 @@
'gpu_common.gypi',
],
'conditions': [
- ['disable_nacl==0 and disable_nacl_untrusted==0', {
+ ['disable_nacl==0', {
'targets': [
{
'target_name': 'gles2_implementation_nacl',
@@ -23,7 +23,9 @@
'nlib_target': 'libgles2_implementation_nacl.a',
'build_glibc': 0,
'build_newlib': 0,
- 'build_irt': 1,
+ 'build_irt': 0,
+ 'build_pnacl_newlib': 0,
+ 'build_nonsfi_helper': 1,
},
'defines': [
'GLES2_IMPL_IMPLEMENTATION',
@@ -33,11 +35,21 @@
],
'dependencies': [
'../native_client/tools.gyp:prep_toolchain',
- '../base/base_nacl.gyp:base_nacl',
+ '../base/base_nacl.gyp:base_nacl_nonsfi',
hamaji 2014/10/20 06:26:34 Sort?
hidehiko 2014/10/20 06:37:15 Done.
'../third_party/khronos/khronos.gyp:khronos_headers',
'command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl',
'gles2_cmd_helper_nacl',
],
+ 'conditions': [
+ ['disable_nacl_untrusted==0', {
+ 'variables': {
+ 'build_irt': 1,
+ },
+ 'dependencies': [
+ '../base/base_nacl.gyp:base_nacl',
+ ],
+ }],
+ ],
},
{
'target_name': 'command_buffer_common_nacl',
@@ -47,16 +59,28 @@
'nlib_target': 'libcommand_buffer_common_nacl.a',
'build_glibc': 0,
'build_newlib': 0,
- 'build_irt': 1,
+ 'build_irt': 0,
+ 'build_pnacl_newlib': 0,
+ 'build_nonsfi_helper': 1,
},
'includes': [
'command_buffer_common.gypi',
],
'dependencies': [
'../native_client/tools.gyp:prep_toolchain',
- '../base/base_nacl.gyp:base_nacl',
+ '../base/base_nacl.gyp:base_nacl_nonsfi',
'command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl',
],
+ 'conditions': [
+ ['disable_nacl_untrusted==0', {
+ 'variables': {
+ 'build_irt': 1,
+ },
+ 'dependencies': [
+ '../base/base_nacl.gyp:base_nacl',
+ ],
+ }],
+ ],
},
{
'target_name': 'gles2_cmd_helper_nacl',
@@ -66,16 +90,28 @@
'nlib_target': 'libgles2_cmd_helper_nacl.a',
'build_glibc': 0,
'build_newlib': 0,
- 'build_irt': 1,
+ 'build_irt': 0,
+ 'build_pnacl_newlib': 0,
+ 'build_nonsfi_helper': 1,
},
'includes': [
'gles2_cmd_helper.gypi',
],
'dependencies': [
'../native_client/tools.gyp:prep_toolchain',
- '../base/base_nacl.gyp:base_nacl',
+ '../base/base_nacl.gyp:base_nacl_nonsfi',
'command_buffer_client_nacl',
],
+ 'conditions': [
+ ['disable_nacl_untrusted==0', {
+ 'variables': {
+ 'build_irt': 1,
+ },
+ 'dependencies': [
+ '../base/base_nacl.gyp:base_nacl',
+ ],
+ }],
+ ],
},
{
'target_name': 'command_buffer_client_nacl',
@@ -85,16 +121,28 @@
'nlib_target': 'libcommand_buffer_client_nacl.a',
'build_glibc': 0,
'build_newlib': 0,
- 'build_irt': 1,
+ 'build_irt': 0,
+ 'build_pnacl_newlib': 0,
+ 'build_nonsfi_helper': 1,
},
'includes': [
'command_buffer_client.gypi',
],
'dependencies': [
'../native_client/tools.gyp:prep_toolchain',
- '../base/base_nacl.gyp:base_nacl',
+ '../base/base_nacl.gyp:base_nacl_nonsfi',
'command_buffer_common_nacl',
],
+ 'conditions': [
+ ['disable_nacl_untrusted==0', {
+ 'variables': {
+ 'build_irt': 1,
+ },
+ 'dependencies': [
+ '../base/base_nacl.gyp:base_nacl',
+ ],
+ }],
+ ],
},
{
'target_name': 'gpu_ipc_nacl',
@@ -104,16 +152,28 @@
'nlib_target': 'libgpu_ipc_nacl.a',
'build_glibc': 0,
'build_newlib': 0,
- 'build_irt': 1,
+ 'build_irt': 0,
+ 'build_pnacl_newlib': 0,
+ 'build_nonsfi_helper': 1,
},
'includes': [
'gpu_ipc.gypi',
],
'dependencies': [
'../native_client/tools.gyp:prep_toolchain',
- '../base/base_nacl.gyp:base_nacl',
+ '../base/base_nacl.gyp:base_nacl_nonsfi',
'command_buffer_common_nacl',
],
+ 'conditions': [
+ ['disable_nacl_untrusted==0', {
+ 'variables': {
+ 'build_irt': 1,
+ },
+ 'dependencies': [
+ '../base/base_nacl.gyp:base_nacl',
+ ],
+ }],
+ ],
},
],
}],
« no previous file with comments | « gpu/command_buffer/command_buffer_nacl.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698