GN Incremental Install: Don't use proguarded dex when is_debug = false

build/config/android/rules.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.
 
 import("//base/android/linker/config.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/toolchain/toolchain.gni")
 import("//third_party/android_platform/config.gni")
 import("//tools/grit/grit_rule.gni")
@@ skipping 1557 matching lines @@
   }
 
   dex("$final_dex_target_name") {
     forward_variables_from(invoker, [ "enable_multidex" ])
     deps = _dex_deps + [ ":$build_config_target" ]
     inputs = [
       _build_config,
     ]
     sources = _dex_sources
     output = final_dex_path
-    if (enable_multidex) {
-      _dex_arg_key = "${_rebased_build_config}:dist_jar:dependency_jars"
-    } else {
-      _dex_arg_key = "${_rebased_build_config}:final_dex:dependency_dex_files"
+
+    # All deps are already included in _dex_sources when proguard is used.
+    if (!_proguard_enabled) {
+      if (enable_multidex) {
+        _dex_arg_key = "${_rebased_build_config}:dist_jar:dependency_jars"
+      } else {
+        _dex_arg_key = "${_rebased_build_config}:final_dex:dependency_dex_files"
+      }
+      args = [ "--inputs=@FileArg($_dex_arg_key)" ]
     }
-    args = [ "--inputs=@FileArg($_dex_arg_key)" ]
 
     if (emma_coverage && !_emma_never_instrument) {
       no_locals = true
       sources += [ "$android_sdk_root/tools/lib/emma_device.jar" ]
     }
   }
 
   if (_native_libs != []) {
     _prepare_native_target_name = "${_template_name}__prepare_native"
     action(_prepare_native_target_name) {
@@ skipping 175 matching lines @@
         rebase_path(_generated_script_path, root_build_dir)
     _rebased_depfile = rebase_path(depfile, root_build_dir)
     _dex_arg_key = "${_rebased_build_config}:final_dex:dependency_dex_files"
     args = [
       "--apk-path=${_rebased_apk_path_no_ext}_incremental.apk",
       "--script-output-path=$_rebased_generated_script_path",
       "--dex-file=$_rebased_lib_dex_path",
       "--dex-file-list=@FileArg($_dex_arg_key)",
       "--depfile=$_rebased_depfile",
     ]
+    if (_proguard_enabled) {
+      args += [ "--show-proguard-warning" ]
+    }
     if (defined(_native_libs_dir)) {
       _rebased_native_libs_dir = rebase_path(_native_libs_dir, root_build_dir)
       args += [ "--lib-dir=$_rebased_native_libs_dir/$android_app_abi" ]
     }
     if (_create_density_splits) {
       args += [ "--split=${_rebased_apk_path_no_ext}-density-*.apk" ]
     }
     if (_create_language_splits) {
       args += [ "--split=${_rebased_apk_path_no_ext}-language-*.apk" ]
     }
@@ skipping 406 matching lines @@
   }
 
   android_library(target_name) {
     java_files = []
     srcjar_deps = [ ":${_template_name}__protoc_java" ]
     deps = [
       "//third_party/android_protobuf:protobuf_nano_javalib",
     ]
   }
 }