From bda1d606f2d31086874b68edd9254e3817d8049c Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Mon, 29 Aug 2016 17:43:45 -0700 Subject: ART: Detach libart-disassembler from libart Some more intrusive changes than I would have liked, as long as ART logging is different from libbase logging. Fix up some includes. Bug: 15436106 Bug: 31338270 Test: m test-art-host Change-Id: I9fbe4b85b2d74e079a4981f3aec9af63b163a461 --- disassembler/disassembler.cc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'disassembler/disassembler.cc') diff --git a/disassembler/disassembler.cc b/disassembler/disassembler.cc index bcd0d1630a..8eecc62cd5 100644 --- a/disassembler/disassembler.cc +++ b/disassembler/disassembler.cc @@ -18,15 +18,23 @@ #include -#include "base/logging.h" -#include "base/stringprintf.h" +#include "android-base/logging.h" +#include "android-base/stringprintf.h" + #include "disassembler_arm.h" #include "disassembler_arm64.h" #include "disassembler_mips.h" #include "disassembler_x86.h" +using android::base::StringPrintf; + namespace art { +Disassembler::Disassembler(DisassemblerOptions* disassembler_options) + : disassembler_options_(disassembler_options) { + CHECK(disassembler_options_ != nullptr); +} + Disassembler* Disassembler::Create(InstructionSet instruction_set, DisassemblerOptions* options) { if (instruction_set == kArm || instruction_set == kThumb2) { return new arm::DisassemblerArm(options); @@ -39,7 +47,7 @@ Disassembler* Disassembler::Create(InstructionSet instruction_set, DisassemblerO } else if (instruction_set == kX86_64) { return new x86::DisassemblerX86(options, true); } else { - UNIMPLEMENTED(FATAL) << "no disassembler for " << instruction_set; + UNIMPLEMENTED(FATAL) << static_cast(instruction_set); return nullptr; } } -- cgit v1.2.3