Update mojo sdk to rev f6c8ec07c01deebc13178d516225fd12695c3dc2

mojo/nacl/generator/mojo_syscall.cc.tmpl

 // 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.
 
 {{generator_warning}}
 
 #include "mojo/nacl/mojo_syscall.h"
 
 #include <stdio.h>
 
@@ skipping 39 matching lines @@
 }
 
 struct NaClDesc* MakeMojoDesc(struct NaClApp* nap) {
   struct NaClDescCustomFuncs funcs = NACL_DESC_CUSTOM_FUNCS_INITIALIZER;
   funcs.Destroy = MojoDescDestroy;
   funcs.SendMsg = MojoDescSendMsg;
   funcs.RecvMsg = MojoDescRecvMsg;
   return NaClDescMakeCustomDesc(nap, &funcs);
 }
 
+void MojoDisabledDescDestroy(void* handle) {
+}
+
+ssize_t MojoDisabledDescSendMsg(void* handle,
+                                const struct NaClImcTypedMsgHdr* msg,
+                                int flags) {
+  fprintf(stderr, "Mojo is not currently supported.");
+  abort();
+}
+
+ssize_t MojoDisabledDescRecvMsg(void* handle,
+                                struct NaClImcTypedMsgHdr* msg,
+                                int flags) {
+  fprintf(stderr, "Mojo is not currently supported.");
+  abort();
+}
+
+struct NaClDesc* MakeDisabledMojoDesc(struct NaClApp* nap) {
+  struct NaClDescCustomFuncs funcs = NACL_DESC_CUSTOM_FUNCS_INITIALIZER;
+  funcs.Destroy = MojoDisabledDescDestroy;
+  funcs.SendMsg = MojoDisabledDescSendMsg;
+  funcs.RecvMsg = MojoDisabledDescRecvMsg;
+  return NaClDescMakeCustomDesc(nap, &funcs);
+}
+
 } // namespace
 
-#define NACL_MOJO_DESC (NACL_CHROME_DESC_BASE + 2)
+// The value for this FD must not conflict with uses inside Chromium. However,
+// mojo/nacl doesn't depend on any Chromium headers, so we can't use a #define
+// from there.
+#define NACL_MOJO_DESC (NACL_CHROME_DESC_BASE + 3)
 
 void InjectMojo(struct NaClApp* nap) {
   NaClAppSetDesc(nap, NACL_MOJO_DESC, MakeMojoDesc(nap));
 }
+
+void InjectDisabledMojo(struct NaClApp* nap) {
+  NaClAppSetDesc(nap, NACL_MOJO_DESC, MakeDisabledMojoDesc(nap));
+}