Merge "Allow mmap reuse in lower 4GB"

2 files changed, 0 insertions, 8 deletions

diff --git a/runtime/mem_map.cc b/runtime/mem_map.cc
index 8abf8a6003..55e9c390cd 100644
--- a/runtime/mem_map.cc
+++ b/runtime/mem_map.cc
@@ -927,9 +927,6 @@ void* MemMap::MapInternal(void* addr,
   UNUSED(low_4gb);
 #endif
   DCHECK_ALIGNED(length, kPageSize);
-  if (low_4gb) {
-    DCHECK_EQ(flags & MAP_FIXED, 0);
-  }
   // TODO:
   // A page allocator would be a useful abstraction here, as
   // 1) It is doubtful that MAP_32BIT on x86_64 is doing the right job for us
diff --git a/runtime/vdex_file.cc b/runtime/vdex_file.cc
index 3ac4aa24c9..c536054883 100644
--- a/runtime/vdex_file.cc
+++ b/runtime/vdex_file.cc
@@ -110,11 +110,6 @@ std::unique_ptr<VdexFile> VdexFile::OpenAtAddress(uint8_t* mmap_addr,
                                                   bool low_4gb,
                                                   bool unquicken,
                                                   std::string* error_msg) {
-  if (low_4gb) {
-    LOG(WARNING) << "Can not mmap vdex in low 4GB";  // TODO: Implement in MemMap.
-    mmap_addr = nullptr;
-    mmap_reuse = false;
-  }
   if (mmap_addr != nullptr && mmap_size < vdex_length) {
     LOG(WARNING) << "Insufficient pre-allocated space to mmap vdex.";
     mmap_addr = nullptr;