Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(220)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/nacl/generator/libmojo.cc.tmpl

Issue 782693004: Update mojo sdk to rev f6c8ec07c01deebc13178d516225fd12695c3dc2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: hack mojo_system_impl gypi for android :| Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« mojo/edk/mojo_edk_system_impl.gypi ('K') | « mojo/mojo_nacl.gyp ('k') | mojo/nacl/generator/mojo_syscall.cc.tmpl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/nacl/generator/libmojo.cc.tmpl
diff --git a/mojo/nacl/generator/libmojo.cc.tmpl b/mojo/nacl/generator/libmojo.cc.tmpl
index 7690d82e07207642037e4c558e1f3464605ff970..7a703765a2ebbd21745c7f523ef5d937dc8a5181 100644
--- a/mojo/nacl/generator/libmojo.cc.tmpl
+++ b/mojo/nacl/generator/libmojo.cc.tmpl
@@ -9,7 +9,10 @@
#include "native_client/src/public/imc_syscalls.h"
#include "native_client/src/public/imc_types.h"
-#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)
static void DoMojoCall(uint32_t params[], nacl_abi_size_t num_params) {
NaClAbiNaClImcMsgIoVec iov[1] = {
« mojo/edk/mojo_edk_system_impl.gypi ('K') | « mojo/mojo_nacl.gyp ('k') | mojo/nacl/generator/mojo_syscall.cc.tmpl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698