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

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 824a44f77c22130e2c5621456c5d3af038de61ed..63d0b184e09f65246500b17044544d1d0079b083 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1575,12 +1575,16 @@ template("android_apk") {
     ]
     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
@@ -1776,6 +1780,9 @@ template("android_apk") {
       "--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" ]