From dcdc85bbd569f0ee66c331b4219c19304a616214 Mon Sep 17 00:00:00 2001 From: Jeff Hao Date: Fri, 4 Dec 2015 14:06:18 -0800 Subject: Dex2oat support for multiple oat file and image file outputs. Multiple changes to dex2oat and the runtime to support a --multi-image option. This generates a separate oat file and image file output for each dex file input. Change-Id: Ie1d6f0b8afa8aed5790065b8c2eb177990c60129 --- runtime/oat_quick_method_header.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'runtime/oat_quick_method_header.h') diff --git a/runtime/oat_quick_method_header.h b/runtime/oat_quick_method_header.h index 03cad0835e..564373958a 100644 --- a/runtime/oat_quick_method_header.h +++ b/runtime/oat_quick_method_header.h @@ -44,7 +44,8 @@ class PACKED(4) OatQuickMethodHeader { uintptr_t code = reinterpret_cast(code_ptr); uintptr_t header = code - OFFSETOF_MEMBER(OatQuickMethodHeader, code_); DCHECK(IsAlignedParam(code, GetInstructionSetAlignment(kRuntimeISA)) || - IsAlignedParam(header, GetInstructionSetAlignment(kRuntimeISA))); + IsAlignedParam(header, GetInstructionSetAlignment(kRuntimeISA))) + << std::hex << code << " " << std::hex << header; return reinterpret_cast(header); } -- cgit v1.2.3-59-g8ed1b