Merge art-cache dex files into oat files
Change-Id: I5a327a4e0b678bd9dabb12de4e21ef05e3fefd0b
diff --git a/src/mem_map.cc b/src/mem_map.cc
index c5858c1..09391df 100644
--- a/src/mem_map.cc
+++ b/src/mem_map.cc
@@ -103,7 +103,7 @@
#endif
}
-MemMap* MemMap::Map(const char* name, byte* addr, size_t length, int prot) {
+MemMap* MemMap::MapAnonymous(const char* name, byte* addr, size_t length, int prot) {
CHECK_NE(0U, length);
CHECK_NE(0, prot);
size_t page_aligned_size = RoundUp(length, kPageSize);
@@ -129,7 +129,7 @@
return new MemMap(actual, length, actual, page_aligned_size);
}
-MemMap* MemMap::Map(byte* addr, size_t length, int prot, int flags, int fd, off_t start) {
+MemMap* MemMap::MapFileAtAddress(byte* addr, size_t length, int prot, int flags, int fd, off_t start) {
CHECK_NE(0U, length);
CHECK_NE(0, prot);
CHECK_NE(0, flags & (MAP_SHARED | MAP_PRIVATE));