diff options
| author | Andreas Gampe <agampe@google.com> | 2016-08-29 17:43:45 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2016-09-08 10:13:47 -0700 |
| commit | bda1d606f2d31086874b68edd9254e3817d8049c (patch) | |
| tree | db07417935fe72e99c3da60152e13f0620c7d8d7 /runtime/base/bit_utils.h | |
| parent | d14d515df39cd963179088b8721768f9645243aa (diff) | |
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
Diffstat (limited to 'runtime/base/bit_utils.h')
| -rw-r--r-- | runtime/base/bit_utils.h | 5 |
1 files changed, 5 insertions, 0 deletions
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 <limits> #include <type_traits> +// 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" |