Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2705)

Unified Diff: build/config/android/rules.gni

Issue 2181053002: android: dcheck_always_on sets BuildConfig.IS_DCHECK (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix findbugs Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 35be87bd3d76bd25c55bcf65a4b5c27264f05b10..1ad8e5b330737e6a02dd6516dd3302cd33a6f530 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -4,6 +4,7 @@
import("//build/config/android/config.gni")
import("//build/config/android/internal_rules.gni")
+import("//build/config/dcheck_always_on.gni")
import("//build/toolchain/toolchain.gni")
assert(is_android)
@@ -1754,8 +1755,8 @@ if (enable_java_templates) {
if (enable_multidex) {
defines += [ "ENABLE_MULTIDEX" ]
}
- if (!is_java_debug) {
- defines += [ "NDEBUG" ]
+ if (is_java_debug || dcheck_always_on) {
+ defines += [ "_DCHECK_IS_ON" ]
}
}
_srcjar_deps += [ ":${_template_name}__build_config_java" ]
« no previous file with comments | « build/config/android/config.gni ('k') | chrome/android/java/src/org/chromium/chrome/browser/ChromeStrictMode.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698