From ec7f1a96683836d9375adc48c6bf802c0ce2160e Mon Sep 17 00:00:00 2001 From: Jeff Hao Date: Mon, 13 Mar 2017 16:24:24 -0700 Subject: Added new -v option to dexlayout to verify output dex file. Passing -v will cause dexlayout to do an IR level comparison of the output with the original input dex file. This checks that the data in the dex files are the same, but allows for different offsets since the output dex file may have a different layout. Test: mm test-art-host Bug: 36107940 Change-Id: If75a93973ffdd2d91111727f089713c800d8cee8 --- dexlayout/dex_ir.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dexlayout/dex_ir.cc') diff --git a/dexlayout/dex_ir.cc b/dexlayout/dex_ir.cc index 34983cf5fb..4228503a8f 100644 --- a/dexlayout/dex_ir.cc +++ b/dexlayout/dex_ir.cc @@ -56,7 +56,7 @@ static void GetLocalsCb(void* context, const DexFile::LocalInfo& entry) { entry.end_address_, entry.reg_))); } -static uint32_t GetCodeItemSize(const DexFile& dex_file, const DexFile::CodeItem& disk_code_item) { +static uint32_t GetCodeItemSize(const DexFile::CodeItem& disk_code_item) { uintptr_t code_item_start = reinterpret_cast(&disk_code_item); uint32_t insns_size = disk_code_item.insns_size_in_code_units_; uint32_t tries_size = disk_code_item.tries_size_; @@ -675,7 +675,7 @@ CodeItem* Collections::CreateCodeItem(const DexFile& dex_file, } } - uint32_t size = GetCodeItemSize(dex_file, disk_code_item); + uint32_t size = GetCodeItemSize(disk_code_item); CodeItem* code_item = new CodeItem( registers_size, ins_size, outs_size, debug_info, insns_size, insns, tries, handler_list); code_item->SetSize(size); -- cgit v1.2.3-59-g8ed1b