Update mojo sdk to rev f6c8ec07c01deebc13178d516225fd12695c3dc2

mojo/edk/embedder/simple_platform_shared_buffer_posix.cc

 // 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.
 
 #include "mojo/edk/embedder/simple_platform_shared_buffer.h"
 
 #include <stdint.h>
 #include <stdio.h>     // For |fileno()|.
 #include <sys/mman.h>  // For |mmap()|/|munmap()|.
 #include <sys/stat.h>
@@ skipping 15 matching lines @@
 // We assume that |size_t| and |off_t| (type for |ftruncate()|) fits in a
 // |uint64_t|.
 static_assert(sizeof(size_t) <= sizeof(uint64_t), "size_t too big");
 static_assert(sizeof(off_t) <= sizeof(uint64_t), "off_t too big");
 
 namespace mojo {
 namespace embedder {
 
 // SimplePlatformSharedBuffer --------------------------------------------------
 
+// The implementation for android uses ashmem to generate the file descriptor
+// for the shared memory. See simple_platform_shared_buffer_android.cc
+#if !defined(OS_ANDROID)
+
 bool SimplePlatformSharedBuffer::Init() {
   DCHECK(!handle_.is_valid());
 
   base::ThreadRestrictions::ScopedAllowIO allow_io;
 
   if (static_cast<uint64_t>(num_bytes_) >
       static_cast<uint64_t>(std::numeric_limits<off_t>::max())) {
     return false;
   }
 
@@ skipping 62 matching lines @@
     LOG(ERROR) << "Shared memory file has the wrong size";
     return false;
   }
 
   // TODO(vtl): More checks?
 
   handle_ = platform_handle.Pass();
   return true;
 }
 
+#endif  // !defined(OS_ANDROID)
+
 scoped_ptr<PlatformSharedBufferMapping> SimplePlatformSharedBuffer::MapImpl(
     size_t offset,
     size_t length) {
   size_t offset_rounding = offset % base::SysInfo::VMAllocationGranularity();
   size_t real_offset = offset - offset_rounding;
   size_t real_length = length + offset_rounding;
 
   // This should hold (since we checked |num_bytes| versus the maximum value of
   // |off_t| on creation, but it never hurts to be paranoid.
   DCHECK_LE(static_cast<uint64_t>(real_offset),
@@ skipping 16 matching lines @@
 
 // SimplePlatformSharedBufferMapping -------------------------------------------
 
 void SimplePlatformSharedBufferMapping::Unmap() {
   int result = munmap(real_base_, real_length_);
   PLOG_IF(ERROR, result != 0) << "munmap";
 }
 
 }  // namespace embedder
 }  // namespace mojo