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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gpu/gpu_nacl.gyp

Issue 670183003: Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7 (Closed) Base URL: git@github.com:domokit/mojo.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/gpu.gyp ('k') | net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java » ('j') | 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..003f0af84f67f2c1b731199603aa58117a8e8c6a 100644
--- a/gpu/gpu_nacl.gyp
+++ b/gpu/gpu_nacl.gyp
@@ -24,6 +24,8 @@
'build_glibc': 0,
'build_newlib': 0,
'build_irt': 1,
+ 'build_pnacl_newlib': 0,
+ 'build_nonsfi_helper': 1,
},
'defines': [
'GLES2_IMPL_IMPLEMENTATION',
@@ -32,8 +34,9 @@
'<@(gles2_implementation_source_files)',
],
'dependencies': [
- '../native_client/tools.gyp:prep_toolchain',
'../base/base_nacl.gyp:base_nacl',
+ '../base/base_nacl.gyp:base_nacl_nonsfi',
+ '../native_client/tools.gyp:prep_toolchain',
'../third_party/khronos/khronos.gyp:khronos_headers',
'command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl',
'gles2_cmd_helper_nacl',
@@ -48,13 +51,16 @@
'build_glibc': 0,
'build_newlib': 0,
'build_irt': 1,
+ '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',
+ '../native_client/tools.gyp:prep_toolchain',
'command_buffer/command_buffer_nacl.gyp:gles2_utils_nacl',
],
},
@@ -67,13 +73,16 @@
'build_glibc': 0,
'build_newlib': 0,
'build_irt': 1,
+ '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',
+ '../native_client/tools.gyp:prep_toolchain',
'command_buffer_client_nacl',
],
},
@@ -86,13 +95,16 @@
'build_glibc': 0,
'build_newlib': 0,
'build_irt': 1,
+ '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',
+ '../native_client/tools.gyp:prep_toolchain',
'command_buffer_common_nacl',
],
},
@@ -105,13 +117,16 @@
'build_glibc': 0,
'build_newlib': 0,
'build_irt': 1,
+ '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',
+ '../native_client/tools.gyp:prep_toolchain',
'command_buffer_common_nacl',
],
},
« no previous file with comments | « gpu/gpu.gyp ('k') | net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698