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

mojo/mojo_edk.gypi

 # Copyright 2016 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': {
     'mojo_edk_ports_sources': [
       'edk/system/ports/event.cc',
       'edk/system/ports/event.h',
       'edk/system/ports/message.cc',
@@ skipping 17 matching lines @@
       'edk/embedder/embedder.cc',
       'edk/embedder/embedder.h',
       'edk/embedder/embedder_internal.h',
       'edk/embedder/entrypoints.cc',
       'edk/embedder/named_platform_channel_pair_win.cc',
       'edk/embedder/named_platform_channel_pair.h',
       'edk/embedder/platform_channel_pair.cc',
       'edk/embedder/platform_channel_pair.h',
       'edk/embedder/platform_channel_pair_posix.cc',
       'edk/embedder/platform_channel_pair_win.cc',
-      'edk/embedder/platform_channel_utils_posix.cc',
-      'edk/embedder/platform_channel_utils_posix.h',
       'edk/embedder/platform_handle.cc',
       'edk/embedder/platform_handle.h',
       'edk/embedder/platform_handle_utils.h',
       'edk/embedder/platform_handle_utils_posix.cc',
       'edk/embedder/platform_handle_utils_win.cc',
       'edk/embedder/platform_handle_vector.h',
       'edk/embedder/platform_shared_buffer.cc',
       'edk/embedder/platform_shared_buffer.h',
       'edk/embedder/scoped_platform_handle.h',
       'edk/system/awakable.h',
@@ skipping 49 matching lines @@
       'edk/system/watcher_set.cc',
       'edk/system/watcher_set.h',
       # Test-only code:
       # TODO(vtl): It's a little unfortunate that these end up in the same
       # component as non-test-only code. In the static build, this code
       # should hopefully be dead-stripped.
       'edk/embedder/test_embedder.cc',
       'edk/embedder/test_embedder.h',
     ],
     'mojo_edk_system_impl_non_nacl_sources': [
+      'edk/embedder/platform_channel_utils_posix.cc',
+      'edk/embedder/platform_channel_utils_posix.h',
       'edk/system/broker_host_posix.cc',
       'edk/system/broker_posix.cc',
       'edk/system/channel_posix.cc',
       'edk/system/remote_message_pipe_bootstrap.cc',
     ],
+    'mojo_edk_system_impl_nacl_nonsfi_sources': [
+      'edk/embedder/platform_channel_utils_posix.cc',
+      'edk/embedder/platform_channel_utils_posix.h',
+      'edk/system/broker_posix.cc',
+      'edk/system/channel_posix.cc',
+    ],
   },
 }