summaryrefslogtreecommitdiffstats
path: root/Source/JavaScriptCore
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-10-26 18:03:24 +0100
committerSteve Block <steveblock@google.com>2011-10-28 14:57:43 +0100
commit55c803ea682f7facace8e4148ad1a12063142a1c (patch)
treeb67e1b77eb840dfddd7cf53f7bf2ca0d5af5652c /Source/JavaScriptCore
parentd50dcb1111b9599889cff6c3b4a112e5dfa3ce59 (diff)
downloadexternal_webkit-55c803ea682f7facace8e4148ad1a12063142a1c.zip
external_webkit-55c803ea682f7facace8e4148ad1a12063142a1c.tar.gz
external_webkit-55c803ea682f7facace8e4148ad1a12063142a1c.tar.bz2
Force LOG_ERROR() to be enabled in all builds
Also, now that LOG() no longer collides with the system logging macro, don't force LOG() and LOG_VERBOSE() to always be disabled. Bug: 5448972 Change-Id: I7f3691b41b5d6f419f4b44c70750489cc6c9e4ed
Diffstat (limited to 'Source/JavaScriptCore')
-rw-r--r--Source/JavaScriptCore/wtf/Platform.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/JavaScriptCore/wtf/Platform.h b/Source/JavaScriptCore/wtf/Platform.h
index e92af89..d7cd222 100644
--- a/Source/JavaScriptCore/wtf/Platform.h
+++ b/Source/JavaScriptCore/wtf/Platform.h
@@ -676,7 +676,10 @@
#if PLATFORM(ANDROID)
#define WEBCORE_NAVIGATOR_VENDOR "Google Inc."
-#define LOG_DISABLED 1
+// Force LOG_ERROR() to be enabled in all builds. All other logging and
+// assertions are enabled in debug builds only.
+#define ERROR_DISABLED 0
+
// This must be defined before we include FastMalloc.h in config.h.
#define USE_SYSTEM_MALLOC 1