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.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'disassembler/disassembler.h') diff --git a/disassembler/disassembler.h b/disassembler/disassembler.h index 86793ccb19..1ef456cefd 100644 --- a/disassembler/disassembler.h +++ b/disassembler/disassembler.h @@ -21,8 +21,9 @@ #include +#include "android-base/macros.h" + #include "arch/instruction_set.h" -#include "base/macros.h" namespace art { @@ -81,10 +82,7 @@ class Disassembler { } protected: - explicit Disassembler(DisassemblerOptions* disassembler_options) - : disassembler_options_(disassembler_options) { - CHECK(disassembler_options_ != nullptr); - } + explicit Disassembler(DisassemblerOptions* disassembler_options); std::string FormatInstructionPointer(const uint8_t* begin); -- cgit v1.2.3