summaryrefslogtreecommitdiffstats
path: root/tools/android
diff options
context:
space:
mode:
authorwangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-10 18:23:38 +0000
committerwangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-10 18:23:38 +0000
commit1a150551a669a94dbdc316b452721b721354bedc (patch)
treeafe18b1e11656f71d8cb09f19c88ae5a88773dab /tools/android
parent9d4a5601ae06d88f19522e0aca4f08f2f0c946c3 (diff)
downloadchromium_src-1a150551a669a94dbdc316b452721b721354bedc.zip
chromium_src-1a150551a669a94dbdc316b452721b721354bedc.tar.gz
chromium_src-1a150551a669a94dbdc316b452721b721354bedc.tar.bz2
Let DCHECK in non-official-release build be opt-in with dcheck_always_on=1 only
- Remove DCHECK in non-official-release build by default - Gyp variable dcheck_always_on=1 (existing) forces to enable DCHECK in release build - Remove flag --enable-dcheck Other effects/notes: - Now allow "buildtype=Official dcheck_always_on=1" (which will enable DCHECK in official build) combination. - Gyp variable logging_like_official_build no longer has an effect - Leave DCHECK_IS_ON() unchanged. May deal with it in a later change if needed. This won't affect bots which use dcheck_always_on=1. BUG=350462 TEST=LoggingTest.Dcheck R=thakis@chromium.org TBR=darin,sehr (command line changes in components/nacl and mojo) Review URL: https://codereview.chromium.org/189603007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255987 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/android')
-rw-r--r--tools/android/forwarder2/daemon.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/android/forwarder2/daemon.cc b/tools/android/forwarder2/daemon.cc
index 0a7e502..d753302 100644
--- a/tools/android/forwarder2/daemon.cc
+++ b/tools/android/forwarder2/daemon.cc
@@ -46,8 +46,6 @@ void InitLoggingForDaemon(const std::string& log_file) {
logging::LOG_TO_SYSTEM_DEBUG_LOG : logging::LOG_TO_FILE;
settings.log_file = log_file.c_str();
settings.lock_log = logging::DONT_LOCK_LOG_FILE;
- settings.dcheck_state =
- logging::ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
CHECK(logging::InitLogging(settings));
}