Android: Hook up aapt's main dex proguard rules

build/config/android/internal_rules.gni

Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 8002bc085b6c59c3f47efdcef8c26cf34d0c2883..599e5ce1403c90dd9cddb3326a8fc67f9d240f9a 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -942,6 +942,13 @@ if (enable_java_templates) {
           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
         }
@@ -2702,6 +2709,14 @@ if (enable_java_templates) {
         ]
       }
 
+      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
       }