mojo/edk/embedder/simple_platform_shared_buffer_posix.cc - Issue 782693004: Update mojo sdk to rev f6c8ec07c01deebc13178d516225fd12695c3dc2

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/edk/embedder/simple_platform_shared_buffer_posix.cc

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

« no previous file with comments | « mojo/edk/embedder/simple_platform_shared_buffer_android.cc ('k') | mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc » ('j') | mojo/edk/mojo_edk_system_impl.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/edk/embedder/simple_platform_shared_buffer_posix.cc

diff --git a/mojo/edk/embedder/simple_platform_shared_buffer_posix.cc b/mojo/edk/embedder/simple_platform_shared_buffer_posix.cc

index 8dfcf44bbac1cdae7fb06d0eb8cdc988503fe88d..a3d10ef9eba4dbf008a39559804a88a7371a1758 100644

--- a/mojo/edk/embedder/simple_platform_shared_buffer_posix.cc

+++ b/mojo/edk/embedder/simple_platform_shared_buffer_posix.cc

@@ -33,6 +33,10 @@ 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());

@@ -115,6 +119,8 @@ bool SimplePlatformSharedBuffer::InitFromPlatformHandle(

return true;

}

+#endif // !defined(OS_ANDROID)

scoped_ptr<PlatformSharedBufferMapping> SimplePlatformSharedBuffer::MapImpl(

size_t offset,

size_t length) {