| Index: runtime/bin/file_android.cc
|
| diff --git a/runtime/bin/file_android.cc b/runtime/bin/file_android.cc
|
| index 9bcf44c8334e8c8361d8fc764398ba133705257d..5123b3dc64b0deb12f9c4fe4134931a199218578 100644
|
| --- a/runtime/bin/file_android.cc
|
| +++ b/runtime/bin/file_android.cc
|
| @@ -78,17 +78,25 @@ bool File::IsClosed() {
|
| }
|
|
|
|
|
| -void* File::MapExecutable(intptr_t* len) {
|
| +void* File::MapReadOnly(int64_t position, int64_t length) {
|
| ASSERT(handle_->fd() >= 0);
|
| + void* addr = mmap(0, length,
|
| + PROT_READ, MAP_PRIVATE,
|
| + handle_->fd(), position);
|
| + if (addr == MAP_FAILED) {
|
| + return NULL;
|
| + }
|
| + return addr;
|
| +}
|
| +
|
|
|
| - intptr_t length = Length();
|
| +void* File::MapReadExecute(int64_t position, int64_t length) {
|
| + ASSERT(handle_->fd() >= 0);
|
| void* addr = mmap(0, length,
|
| PROT_READ | PROT_EXEC, MAP_PRIVATE,
|
| - handle_->fd(), 0);
|
| + handle_->fd(), position);
|
| if (addr == MAP_FAILED) {
|
| - *len = -1;
|
| - } else {
|
| - *len = length;
|
| + return NULL;
|
| }
|
| return addr;
|
| }
|
|
|