Switching over to full usage of is_java_debug

build/config/android/config.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file contains common system config stuff for the Android build.
 
 if (is_android) {
   assert(rebase_path("//", root_build_dir) == "../../",
          "Android output directory must be nested 2 levels within src/ (" +
              "e.g.: out-gn/Debug). http://crbug.com/412935")
@@ skipping 108 matching lines @@
 
     # Speed up incremental compiles by compiling only changed files.
     enable_incremental_javac = false
 
     # Speed up dexing using dx --incremental.
     enable_incremental_dx = is_java_debug
 
     # Neither of these should ever be used for release builds since they are
     # somewhat experimental and dx --incremental is known to not produce
     # byte-for-byte identical output.
-    assert(!(enable_incremental_dx && !is_debug))
-    assert(!(enable_incremental_javac && !is_debug))
+    assert(!(enable_incremental_dx && !is_java_debug))
+    assert(!(enable_incremental_javac && !is_java_debug))
 
     # Adds intrumentation to each function. Writes a file with the order that
     # functions are called at startup.
     use_order_profiling = false
   }
 
   # Host stuff -----------------------------------------------------------------
 
   # Defines the name the Android build gives to the current host CPU
   # architecture, which is different than the names GN uses.
@@ skipping 134 matching lines @@
   } else if (current_cpu == "mips64el") {
     android_app_abi = "mips64"
   } else {
     assert(false, "Unknown Android ABI: " + current_cpu)
   }
 
   if (android_libcpp_lib_dir == "") {
     android_libcpp_lib_dir = "${android_libcpp_root}/libs/${android_app_abi}"
   }
 }