summaryrefslogtreecommitdiffstats
path: root/base/logging.h
diff options
context:
space:
mode:
authormichaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-07 20:46:50 +0000
committermichaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-07 20:46:50 +0000
commit3132e35cb49119f36a529f2370d9de5887582bc2 (patch)
treee23bdd40d066e3523e870c46ea9d77189d83d954 /base/logging.h
parent16adff66ea7224ddd91d01160a7bcc54f5d8b5a6 (diff)
downloadchromium_src-3132e35cb49119f36a529f2370d9de5887582bc2.zip
chromium_src-3132e35cb49119f36a529f2370d9de5887582bc2.tar.gz
chromium_src-3132e35cb49119f36a529f2370d9de5887582bc2.tar.bz2
Upstream android debug and log related files
BUG= TEST= Review URL: http://codereview.chromium.org/7238012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91748 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/logging.h')
-rw-r--r--base/logging.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/base/logging.h b/base/logging.h
index b12defc..849de0e 100644
--- a/base/logging.h
+++ b/base/logging.h
@@ -703,7 +703,12 @@ const LogSeverity LOG_DCHECK = LOG_INFO;
#define DCHECK_GE(val1, val2) DCHECK_OP(GE, >=, val1, val2)
#define DCHECK_GT(val1, val2) DCHECK_OP(GT, > , val1, val2)
+#if defined(OS_ANDROID) && !defined(OFFICIAL_BUILD)
+// TODO(port): fix once "enough" works
+#define NOTREACHED() LOG(ERROR) << "NOTREACHED()"
+#else
#define NOTREACHED() DCHECK(false)
+#endif
// Redefine the standard assert to use our nice log files
#undef assert