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

components/nacl_nonsfi.gyp

Index: components/nacl_nonsfi.gyp
diff --git a/components/nacl_nonsfi.gyp b/components/nacl_nonsfi.gyp
index 3bd4a13b777ce1f74f5afdd5e7c8bea93df39405..3ae7a351083cd3dd782f55e2ddbc4bea1bbc813f 100644
--- a/components/nacl_nonsfi.gyp
+++ b/components/nacl_nonsfi.gyp
@@ -41,7 +41,13 @@
               ['target_arch=="ia32" or target_arch=="x64"', {
                 'extra_deps_newlib32_nonsfi': [
                   '>(tc_lib_dir_nonsfi_helper32)/libbase_nacl_nonsfi.a',
+                  '>(tc_lib_dir_nonsfi_helper32)/libcommand_buffer_client_nacl.a',
+                  '>(tc_lib_dir_nonsfi_helper32)/libcommand_buffer_common_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libevent_nacl_nonsfi.a',
+                  '>(tc_lib_dir_nonsfi_helper32)/libgles2_cmd_helper_nacl.a',
+                  '>(tc_lib_dir_nonsfi_helper32)/libgles2_implementation_nacl.a',
+                  '>(tc_lib_dir_nonsfi_helper32)/libgles2_utils_nacl.a',
+                  '>(tc_lib_dir_nonsfi_helper32)/libgpu_ipc_nacl.a',
                 ],
               }],
             ],
@@ -51,6 +57,16 @@
             '<(DEPTH)/native_client/src/nonsfi/irt/irt.gyp:nacl_sys_private',
             '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
             '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+
+            # Temporary depends on some libraries to make sure they can be
+            # built properly. These are depended by PPAPI library.
+            # TODO(hidehiko): Remove them when PPAPI library is introduced.
+            '../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',
+            '../gpu/gpu_nacl.gyp:gles2_cmd_helper_nacl',
+            '../gpu/gpu_nacl.gyp:gles2_implementation_nacl',
+            '../gpu/gpu_nacl.gyp:gpu_ipc_nacl',
           ],
         },
         # TODO(hidehiko): Add Non-SFI version of nacl_loader_unittests.