Non-SFI Mode: Build ipc/ library by PNaCl toolchain for nacl_helper_nonsfi.

components/nacl_nonsfi.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/common_untrusted.gypi',
   ],
   'conditions': [
     ['disable_nacl==0 and disable_nacl_untrusted==0', {
       'targets': [
         {
+          # nacl_helper_nonsfi is similar to nacl_helper (built in nacl.gyp)
+          # but for the NaCl plugin in Non-SFI mode.
+          # This binary is built using the PNaCl toolchain, but it is native
+          # linux binary and will run on Linux directly.
+          # Most library code can be shared with the one for untrusted build
+          # (i.e. the one for irt.nexe built by the NaCl/PNaCl toolchain), but
+          # as nacl_helper_nonsfi runs on Linux, there are some differences,
+          # such as MessageLoopForIO (which is based on libevent in Non-SFI
+          # mode) or ipc_channel implementation.
+          # Because of the toolchain, in both builds, OS_NACL macro (derived
+          # from __native_client__ macro) is defined. Code can test whether
+          # __native_client_nonsfi__ is #defined in order to determine
+          # whether it is being compiled for SFI mode or Non-SFI mode.
+          #
           # Currently, nacl_helper_nonsfi is under development and the binary
           # does nothing (i.e. it has only empty main(), now).
           # TODO(crbug.com/358465): Implement it then switch nacl_helper in
           # Non-SFI mode to nacl_helper_nonsfi.
           'target_name': 'nacl_helper_nonsfi',
           'type': 'none',
           'variables': {
             'nacl_untrusted_build': 1,
             'nexe_target': 'nacl_helper_nonsfi',
             # Rename the output binary file to nacl_helper_nonsfi and put it
@@ skipping 15 matching lines @@
               ['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',
+                  '>(tc_lib_dir_nonsfi_helper32)/libipc_nacl_nonsfi.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libshared_memory_support_nacl.a',
                 ],
               }],
             ],
           },
           'dependencies': [
             '../base/base_nacl.gyp:base_nacl_nonsfi',
+            '../ipc/ipc_nacl.gyp:ipc_nacl_nonsfi',
             '../native_client/src/nonsfi/irt/irt.gyp:nacl_sys_private',
             '../native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
             '../native_client/tools.gyp:prep_toolchain',
 
             # Temporarily depends on some libraries to make sure they can be
             # built properly. These are depended on 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',
             '../media/media_nacl.gyp:shared_memory_support_nacl',
           ],
         },
         # TODO(hidehiko): Add Non-SFI version of nacl_loader_unittests.
       ],
     }],
   ],
 }