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

ppapi/ppapi_proxy_nacl.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 24 matching lines @@
             '../components/tracing_nacl.gyp:tracing_nacl',
             '../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',
             '../ipc/ipc_nacl.gyp:ipc_nacl',
             '../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',
             '../ppapi/ppapi_ipc_nacl.gyp:ppapi_ipc_nacl',
             '../ppapi/ppapi_shared_nacl.gyp:ppapi_shared_nacl',
             '../third_party/WebKit/public/blink_headers.gyp:blink_headers',
             '../third_party/khronos/khronos.gyp:khronos_headers',
           ],
         },
       ],
     }],
   ],
 }