summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Hao <jeffhao@google.com> 2013-04-26 22:05:19 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2013-04-26 22:05:19 +0000
commit5d29a81465a973c66e479f8edf2a55f09a83fc9c (patch)
tree118352977f1507c209d075478b0ae5d7b5c64265
parentdfe0a24ff341e1758d00f2d51ca38eda8e58c705 (diff)
parent6ed90ad082b41b8e9665ef9c647fa4353f1269cd (diff)
Merge "Changed image file to no longer be executable." into dalvik-dev
-rw-r--r--src/gc/space.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gc/space.cc b/src/gc/space.cc
index bfc3e86d0a..1d3ee28d5b 100644
--- a/src/gc/space.cc
+++ b/src/gc/space.cc
@@ -498,8 +498,7 @@ ImageSpace* ImageSpace::Create(const std::string& image_file_name) {
}
UniquePtr<MemMap> map(MemMap::MapFileAtAddress(image_header.GetImageBegin(),
file->GetLength(),
- // TODO: selectively PROT_EXEC stubs
- PROT_READ | PROT_WRITE | PROT_EXEC,
+ PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_FIXED,
file->Fd(),
0,