Various changes to make Mojo work under NaCl non-sfi.

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',
@@ skipping 56 matching lines @@
               '-levent_nacl_nonsfi',
               '-lgio',
               '-lgles2_cmd_helper_nacl',
               '-lgles2_implementation_nacl',
               '-lgles2_utils_nacl',
               '-lgpu_ipc_nacl',
               '-lipc_nacl_nonsfi',
               '-lmojo_cpp_bindings_nacl',
               '-lmojo_cpp_system_nacl',
               '-lmojo_public_system_nacl',
-              '-lmojo_system_impl_nacl',
+              '-lmojo_system_impl_nacl_nonsfi',
               '-lnacl_helper_nonsfi_sandbox',
               '-lplatform',
               '-lppapi_ipc_nacl',
               '-lppapi_proxy_nacl',
               '-lppapi_shared_nacl',
               '-lsandbox_linux_nacl_nonsfi',
               '-lshared_memory_support_nacl',
               '-ltracing_nacl',
             ],
 
             'conditions': [
               ['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)/libcontent_common_nacl_nonsfi.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libelf_loader.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libevent_nacl_nonsfi.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libgio.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)/libmojo_cpp_bindings_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libmojo_cpp_system_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libmojo_public_system_nacl.a',
-                  '>(tc_lib_dir_nonsfi_helper32)/libmojo_system_impl_nacl.a',
+                  '>(tc_lib_dir_nonsfi_helper32)/libmojo_system_impl_nacl_nonsfi.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libnacl_helper_nonsfi_sandbox.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libplatform.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libppapi_ipc_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libppapi_proxy_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libppapi_shared_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libsandbox_linux_nacl_nonsfi.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libshared_memory_support_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper32)/libtracing_nacl.a',
                 ],
               }],
               ['target_arch=="arm"', {
                 'extra_deps_newlib_arm_nonsfi': [
                   '>(tc_lib_dir_nonsfi_helper_arm)/libbase_nacl_nonsfi.a',
                   '>(tc_lib_dir_nonsfi_helper_arm)/libcommand_buffer_client_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper_arm)/libcommand_buffer_common_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper_arm)/libcontent_common_nacl_nonsfi.a',
                   '>(tc_lib_dir_nonsfi_helper_arm)/libelf_loader.a',
                   '>(tc_lib_dir_nonsfi_helper_arm)/libevent_nacl_nonsfi.a',
                   '>(tc_lib_dir_nonsfi_helper_arm)/libgio.a',
                   '>(tc_lib_dir_nonsfi_helper_arm)/libgles2_cmd_helper_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper_arm)/libgles2_implementation_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper_arm)/libgles2_utils_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper_arm)/libgpu_ipc_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper_arm)/libipc_nacl_nonsfi.a',
                   '>(tc_lib_dir_nonsfi_helper_arm)/libmojo_cpp_bindings_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper_arm)/libmojo_cpp_system_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper_arm)/libmojo_public_system_nacl.a',
-                  '>(tc_lib_dir_nonsfi_helper_arm)/libmojo_system_impl_nacl.a',
+                  '>(tc_lib_dir_nonsfi_helper_arm)/libmojo_system_impl_nacl_nonsfi.a',
                   '>(tc_lib_dir_nonsfi_helper_arm)/libnacl_helper_nonsfi_sandbox.a',
                   '>(tc_lib_dir_nonsfi_helper_arm)/libplatform.a',
                   '>(tc_lib_dir_nonsfi_helper_arm)/libppapi_ipc_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper_arm)/libppapi_proxy_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper_arm)/libppapi_shared_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper_arm)/libsandbox_linux_nacl_nonsfi.a',
                   '>(tc_lib_dir_nonsfi_helper_arm)/libshared_memory_support_nacl.a',
                   '>(tc_lib_dir_nonsfi_helper_arm)/libtracing_nacl.a',
                 ],
               }],
             ],
           },
           'dependencies': [
             '../base/base_nacl.gyp:base_nacl_nonsfi',
             '../content/content_nacl_nonsfi.gyp:content_common_nacl_nonsfi',
             '../ipc/ipc_nacl.gyp:ipc_nacl_nonsfi',
-            '../mojo/mojo_edk_nacl.gyp:mojo_system_impl_nacl',
+            '../mojo/mojo_edk_nacl.gyp:mojo_system_impl_nacl_nonsfi',
             '../mojo/mojo_public_nacl.gyp:mojo_cpp_bindings_nacl',
             '../mojo/mojo_public_nacl.gyp:mojo_cpp_system_nacl',
             '../mojo/mojo_public_nacl.gyp:mojo_public_system_nacl',
             '../native_client/src/nonsfi/irt/irt.gyp:nacl_sys_private',
             '../native_client/src/nonsfi/loader/loader.gyp:elf_loader',
             '../native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
             '../ppapi/ppapi_proxy_nacl.gyp:ppapi_proxy_nacl',
             '../sandbox/linux/sandbox_linux_nacl_nonsfi.gyp:sandbox_linux_nacl_nonsfi',
             'nacl_helper_nonsfi_sandbox',
           ],
@@ skipping 126 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'nacl_helper_nonsfi_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }