Commit a402c117 authored by jrg@google.com's avatar jrg@google.com

Fix Android build.

Accomodate shmem changes in http://codereview.chromium.org/8585002.

BUG=None
TEST=

Review URL: http://codereview.chromium.org/8771022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112588 0039d316-1c4b-4281-b951-d872f2087c98
parent 2ac48599
...@@ -21,7 +21,7 @@ bool SharedMemory::Create(const SharedMemoryCreateOptions& options) { ...@@ -21,7 +21,7 @@ bool SharedMemory::Create(const SharedMemoryCreateOptions& options) {
// "name" is just a label in ashmem. It is visible in /proc/pid/maps. // "name" is just a label in ashmem. It is visible in /proc/pid/maps.
mapped_file_ = ashmem_create_region( mapped_file_ = ashmem_create_region(
options.name == NULL ? "" : options.name.c_str(), options.name == NULL ? "" : options.name->c_str(),
options.size); options.size);
if (-1 == mapped_file_) { if (-1 == mapped_file_) {
DLOG(ERROR) << "Shared memory creation failed"; DLOG(ERROR) << "Shared memory creation failed";
...@@ -34,7 +34,7 @@ bool SharedMemory::Create(const SharedMemoryCreateOptions& options) { ...@@ -34,7 +34,7 @@ bool SharedMemory::Create(const SharedMemoryCreateOptions& options) {
DLOG(ERROR) << "Error " << err << " when setting protection of ashmem"; DLOG(ERROR) << "Error " << err << " when setting protection of ashmem";
return false; return false;
} }
created_size_ = size; created_size_ = options.size;
return true; return true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment