From 58a73d2542f95dfd0535ceaa00eedefe198074a1 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Tue, 29 Nov 2016 21:49:43 +0000 Subject: [PATCH] Don't use ashmen when kIsTargetLinux is set. Test: get JIT enabled when running ART. Change-Id: Ic1c351601d8e85ba6597c3b400fa0094e070a56a --- runtime/mem_map.cc | 2 ++ runtime/mem_map.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/runtime/mem_map.cc b/runtime/mem_map.cc index 1ec59b3cc..6da72e462 100644 --- a/runtime/mem_map.cc +++ b/runtime/mem_map.cc @@ -282,6 +282,7 @@ MemMap* MemMap::MapAnonymous(const char* name, #ifndef __LP64__ UNUSED(low_4gb); #endif + use_ashmem = use_ashmem && !kIsTargetLinux; if (byte_count == 0) { return new MemMap(name, nullptr, 0, nullptr, 0, prot, false); } @@ -522,6 +523,7 @@ MemMap::MemMap(const std::string& name, uint8_t* begin, size_t size, void* base_ MemMap* MemMap::RemapAtEnd(uint8_t* new_end, const char* tail_name, int tail_prot, std::string* error_msg, bool use_ashmem) { + use_ashmem = use_ashmem && !kIsTargetLinux; DCHECK_GE(new_end, Begin()); DCHECK_LE(new_end, End()); DCHECK_LE(begin_ + size_, reinterpret_cast(base_begin_) + base_size_); diff --git a/runtime/mem_map.h b/runtime/mem_map.h index 049ae12ac..0fea1a52c 100644 --- a/runtime/mem_map.h +++ b/runtime/mem_map.h @@ -68,7 +68,7 @@ class MemMap { bool low_4gb, bool reuse, std::string* error_msg, - bool use_ashmem = !kIsTargetLinux); + bool use_ashmem = true); // Create placeholder for a region allocated by direct call to mmap. // This is useful when we do not have control over the code calling mmap, @@ -172,7 +172,7 @@ class MemMap { const char* tail_name, int tail_prot, std::string* error_msg, - bool use_ashmem = !kIsTargetLinux); + bool use_ashmem = true); static bool CheckNoGaps(MemMap* begin_map, MemMap* end_map) REQUIRES(!Locks::mem_maps_lock_); -- 2.11.0