diff options
| author | jrg@google.com <jrg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 01:32:54 +0000 |
|---|---|---|
| committer | jrg@google.com <jrg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-02 01:32:54 +0000 |
| commit | a402c1172e84e4dd85003a93ba6f4aa270acc2dc (patch) | |
| tree | e15d735d0386f634414c8310c7d360d23d01e0b7 /base/shared_memory_android.cc | |
| parent | 2ac4859994d248bac29dd108242f7a602d283d23 (diff) | |
| download | chromium_src-a402c1172e84e4dd85003a93ba6f4aa270acc2dc.zip chromium_src-a402c1172e84e4dd85003a93ba6f4aa270acc2dc.tar.gz chromium_src-a402c1172e84e4dd85003a93ba6f4aa270acc2dc.tar.bz2 | |
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
Diffstat (limited to 'base/shared_memory_android.cc')
| -rw-r--r-- | base/shared_memory_android.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/shared_memory_android.cc b/base/shared_memory_android.cc index 8e55e3a..a5beceb 100644 --- a/base/shared_memory_android.cc +++ b/base/shared_memory_android.cc @@ -21,7 +21,7 @@ bool SharedMemory::Create(const SharedMemoryCreateOptions& options) { // "name" is just a label in ashmem. It is visible in /proc/pid/maps. mapped_file_ = ashmem_create_region( - options.name == NULL ? "" : options.name.c_str(), + options.name == NULL ? "" : options.name->c_str(), options.size); if (-1 == mapped_file_) { DLOG(ERROR) << "Shared memory creation failed"; @@ -34,7 +34,7 @@ bool SharedMemory::Create(const SharedMemoryCreateOptions& options) { DLOG(ERROR) << "Error " << err << " when setting protection of ashmem"; return false; } - created_size_ = size; + created_size_ = options.size; return true; } |