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 --- runtime/base/bit_utils.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'runtime/base/bit_utils.h') diff --git a/runtime/base/bit_utils.h b/runtime/base/bit_utils.h index 378371da84..d2f0fdbd9c 100644 --- a/runtime/base/bit_utils.h +++ b/runtime/base/bit_utils.h @@ -21,7 +21,12 @@ #include #include +// This header is used in the disassembler with libbase's logging. Only include ART logging +// when no other logging macros are available. b/15436106, b/31338270 +#ifndef CHECK #include "base/logging.h" +#endif + #include "base/iteration_range.h" #include "base/stl_util.h" -- cgit v1.2.3-59-g8ed1b