diff options
| author | 2016-09-26 12:51:53 -0700 | |
|---|---|---|
| committer | 2016-09-26 12:55:11 -0700 | |
| commit | 58246a13ded36d5256c6fcd3cc60bae5705a73bd (patch) | |
| tree | c541e811079bd74d506db3a1b906c5f32ed7684e | |
| parent | a4850b0fa18c8b92dd5c20c166856cfe87aec72f (diff) | |
ART: Revert base/logging conditional hacks
This partially reverts commit bda1d606f2d31086874b68edd9254e3817d8049c.
ART was switched to libbase logging.
Bug: 31338270
Test: m test-art-host
Change-Id: I1a2f90d1ddb67d45ebe28d970b3ee7fd2d16a730
| -rw-r--r-- | runtime/base/bit_utils.h | 7 | ||||
| -rw-r--r-- | runtime/base/stl_util.h | 4 |
2 files changed, 1 insertions, 10 deletions
diff --git a/runtime/base/bit_utils.h b/runtime/base/bit_utils.h index d2f0fdbd9c..f0811b020b 100644 --- a/runtime/base/bit_utils.h +++ b/runtime/base/bit_utils.h @@ -21,13 +21,8 @@ #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/logging.h" #include "base/stl_util.h" namespace art { diff --git a/runtime/base/stl_util.h b/runtime/base/stl_util.h index a4cf249861..a53dcea2d7 100644 --- a/runtime/base/stl_util.h +++ b/runtime/base/stl_util.h @@ -20,11 +20,7 @@ #include <algorithm> #include <sstream> -// 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 namespace art { |