Android: Hook up aapt's main dex proguard rules

build/config/android/internal_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.
 
 # Do not add any imports to non-//build directories here.
 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
 import("//build_overrides/build.gni")
 import("//build/config/android/config.gni")
 import("//build/config/dcheck_always_on.gni")
 import("//build/config/sanitizers/sanitizers.gni")
@@ skipping 924 matching lines @@
           "--depfile",
           rebase_path(depfile, root_build_dir),
           "--android-sdk-tools",
           rebased_android_sdk_build_tools,
           "--main-dex-list-path",
           rebase_path(_main_dex_list_path, root_build_dir),
           "--main-dex-rules-path",
           rebase_path(main_dex_rules, root_build_dir),
         ]
 
+        if (defined(invoker.extra_main_dex_proguard_config)) {
+          args += [
+            "--main-dex-rules-path",
+            rebase_path(invoker.extra_main_dex_proguard_config, root_build_dir),

[estevenson, 2017/01/13 16:35:12]

Should this also be an input?

[agrieve, 2017/01/13 17:58:39]

Good catch! Done.

+          ]
+        }
+
         if (defined(invoker.args)) {
           args += invoker.args
         }
 
         if (defined(invoker.sources)) {
           args += rebase_path(invoker.sources, root_build_dir)
         }
       }
     }
 
@@ skipping 1740 matching lines @@
       }
 
       if (defined(invoker.proguard_file)) {
         outputs += [ invoker.proguard_file ]
         args += [
           "--proguard-file",
           rebase_path(invoker.proguard_file, root_build_dir),
         ]
       }
 
+      if (defined(invoker.proguard_file_main_dex)) {
+        outputs += [ invoker.proguard_file_main_dex ]
+        args += [
+          "--proguard-file-main-dex",
+          rebase_path(invoker.proguard_file_main_dex, root_build_dir),
+        ]
+      }
+
       if (defined(invoker.args)) {
         args += invoker.args
       }
     }
   }
 
   # Produces a single .dex.jar out of a set of Java dependencies.
   template("deps_dex") {
     set_sources_assignment_filter([])
     build_config = "$target_gen_dir/${target_name}.build_config"
@@ skipping 109 matching lines @@
         rebase_path(root_build_dir, root_build_dir),
         "--packed-libraries-dir",
         rebase_path(_packed_libraries_dir, root_build_dir),
         "--libraries=${invoker.libraries_filearg}",
         "--filelistjson",
         rebase_path(invoker.file_list_json, root_build_dir),
       ]
     }
   }
 }