Remove gaps between images
We now use the same logic to calculate the size as we use to create
the image header. This should mean that it always lines up correctly.
Previously the alignment rounding could have caused page off by one
errors in some cases.
Re-enable no gap check in heap.cc.
Bug: 26317072
Change-Id: I558a4e60197ca4613fc4ec4c3a618c64a83d006a
diff --git a/runtime/image.cc b/runtime/image.cc
index 3856787..3cb6642 100644
--- a/runtime/image.cc
+++ b/runtime/image.cc
@@ -24,7 +24,7 @@
namespace art {
const uint8_t ImageHeader::kImageMagic[] = { 'a', 'r', 't', '\n' };
-const uint8_t ImageHeader::kImageVersion[] = { '0', '2', '4', '\0' };
+const uint8_t ImageHeader::kImageVersion[] = { '0', '2', '5', '\0' };
ImageHeader::ImageHeader(uint32_t image_begin,
uint32_t image_size,