Non-SFI Mode: Build gpu/ libraries by PNaCl toolchain for nacl_helper_nonsfi.

gpu/command_buffer/command_buffer_nacl.gyp

Index: gpu/command_buffer/command_buffer_nacl.gyp
diff --git a/gpu/command_buffer/command_buffer_nacl.gyp b/gpu/command_buffer/command_buffer_nacl.gyp
index aabd1c84a41f8519fed4b3bcb0ea015135866a7e..79fd46e597d5a8ed97e545b6cb3e9d8898db5003 100644
--- a/gpu/command_buffer/command_buffer_nacl.gyp
+++ b/gpu/command_buffer/command_buffer_nacl.gyp
@@ -11,7 +11,7 @@
     'command_buffer.gypi',
   ],
   'conditions': [
-    ['disable_nacl==0 and disable_nacl_untrusted==0', {
+    ['disable_nacl==0', {
       'targets': [
         {
           'target_name': 'gles2_utils_nacl',
@@ -22,13 +22,25 @@
             'nlib_target': 'libgles2_utils_nacl.a',
             'build_glibc': 0,
             'build_newlib': 0,
-            'build_irt': 1,
+            'build_irt': 0,
+            'build_pnacl_newlib': 0,
+            'build_nonsfi_helper': 1,
           },
           'dependencies': [
             '../../native_client/tools.gyp:prep_toolchain',
-            '../../base/base_nacl.gyp:base_nacl',
+            '../../base/base_nacl.gyp:base_nacl_nonsfi',
             '../../third_party/khronos/khronos.gyp:khronos_headers',
           ],
+          'conditions': [
+            ['disable_nacl_untrusted==0', {
+              'variables': {
+                'build_irt': 1,
+              },
+              'dependencies': [
+                '../../base/base_nacl.gyp:base_nacl',
+              ],
+            }],
+          ],
         },
       ],
     }],