From 1a150551a669a94dbdc316b452721b721354bedc Mon Sep 17 00:00:00 2001 From: "wangxianzhu@chromium.org" Date: Mon, 10 Mar 2014 18:23:38 +0000 Subject: 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 --- content/app/android/library_loader_hooks.cc | 7 ------- 1 file changed, 7 deletions(-) (limited to 'content/app') diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc index c6cb97c..f69933f 100644 --- a/content/app/android/library_loader_hooks.cc +++ b/content/app/android/library_loader_hooks.cc @@ -95,15 +95,8 @@ bool LibraryLoaded(JNIEnv* env, jclass clazz, // Can only use event tracing after setting up the command line. TRACE_EVENT0("jni", "JNI_OnLoad continuation"); - // Note: because logging is setup here right after copying the command line - // array from java to native up top of this method, any code that adds the - // --enable-dcheck switch must do so on the Java side. logging::LoggingSettings settings; settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; - settings.dcheck_state = - command_line->HasSwitch(switches::kEnableDCHECK) ? - logging::ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS : - logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS; logging::InitLogging(settings); // To view log output with IDs and timestamps use "adb logcat -v threadtime". logging::SetLogItems(false, // Process ID -- cgit v1.1