aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQijiang Fan <fqj@google.com>2021-06-24 16:06:43 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-06-24 16:06:43 +0000
commit3ddb84b857e796fb3c628c2eec34383fb90fdd4f (patch)
treed5b2e1140bb5d80e845bd170bd364e892b05ebd1
parent651dde5e145c4ee268ce9aa72ea7a77880298a8a (diff)
parentdd52f5f53116b5880387bc1a878478e172b768be (diff)
downloadpuffin-3ddb84b857e796fb3c628c2eec34383fb90fdd4f.tar.gz
Include base/check.h for CHECK macro for Chromium OS. am: dd52f5f531
Original change: https://android-review.googlesource.com/c/platform/external/puffin/+/1746314 Change-Id: Ia2f876948270a04c06e1edc59db6e31ae146ca6d
-rw-r--r--src/logging.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/logging.h b/src/logging.h
index b48fcd5..8b80153 100644
--- a/src/logging.h
+++ b/src/logging.h
@@ -5,7 +5,10 @@
#ifndef SRC_LOGGING_H_
#define SRC_LOGGING_H_
-#ifdef USE_BRILLO
+#if defined(BASE_VER) && BASE_VER >= 822064
+#include "base/check.h" // CHECK-related macros are defined in base/check.h on Chrome OS.
+#include "base/logging.h"
+#elif USE_BRILLO
#include "base/logging.h"
#else
#include "glog/logging.h"