diff options
| author | 2016-09-26 23:00:02 +0000 | |
|---|---|---|
| committer | 2016-09-26 23:00:02 +0000 | |
| commit | 42c49d236c2dc02c4d3ce8ddd890a48d3812f70e (patch) | |
| tree | 0a9ff4247ae3ee3468f6c636dbdc9f38f64c7e34 | |
| parent | cda79e87e0e12ad0b413dd3df3ba4662a3b4b1cb (diff) | |
| parent | 58246a13ded36d5256c6fcd3cc60bae5705a73bd (diff) | |
Merge "ART: Revert base/logging conditional hacks"
| -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 { |