diff options
Diffstat (limited to 'runtime/base/stl_util.h')
| -rw-r--r-- | runtime/base/stl_util.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/base/stl_util.h b/runtime/base/stl_util.h index a53dcea2d7..a4cf249861 100644 --- a/runtime/base/stl_util.h +++ b/runtime/base/stl_util.h @@ -20,7 +20,11 @@ #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 { |