[Android] Add gn support for multidex.

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.
 
 import("//build/config/android/config.gni")
 import("//build/config/zip.gni")
 import("//third_party/ijar/ijar.gni")
 
 assert(is_android)
 
@@ skipping 205 matching lines @@
         "--bootclasspath",
         invoker.bootclasspath,
       ]
     }
   }
 }
 
 template("dex") {
   set_sources_assignment_filter([])
 
+  _multidex = defined(invoker.multidex) && invoker.multidex

[agrieve, 2015/11/16 19:02:33]

nit: It would be more GN'y to call this "enable_multidex" or "use_multidex"

[jbudorick, 2015/11/16 20:45:56]

I'm still getting a handle on what's GN'y. switched to enable_multidex

+
+  if (_multidex) {
+    _main_dex_list_path = invoker.output + ".main_dex_list"
+    template("main_dex_list_helper") {

[agrieve, 2015/11/16 19:02:33]

doesn't look like this is used more than once, so no need to use a template...
Unless you're planning on re-using it, in which case it's fine.

[jbudorick, 2015/11/16 20:45:56]

I'm not. I think I patterned this off of something else, but I forget what.
Removed the template.

+      action(target_name) {
+        forward_variables_from(invoker,
+                               [
+                                 "deps",
+                                 "inputs",
+                                 "sources",
+                                 "testonly",
+                               ])
+
+        script = "//build/android/gyp/main_dex_list.py"
+        depfile = "$target_gen_dir/$target_name.d"
+
+        main_dex_rules = "//build/android/main_dex_classes.flags"
+
+        outputs = [
+          depfile,
+          invoker.output,
+        ]
+
+        args = [
+          "--depfile",
+          rebase_path(depfile, root_build_dir),
+          "--android-sdk-tools",
+          rebased_android_sdk_build_tools,
+          "--main-dex-list-path",
+          rebase_path(invoker.output, root_build_dir),
+          "--main-dex-rules-path",
+          rebase_path(main_dex_rules, root_build_dir),
+        ]
+
+        if (defined(invoker.args)) {
+          args += invoker.args
+        }
+
+        if (defined(invoker.sources)) {
+          args += rebase_path(invoker.sources, root_build_dir)
+        }
+      }
+    }
+
+    _main_dex_list_target_name = "${target_name}__main_dex_list"
+    main_dex_list_helper(_main_dex_list_target_name) {
+      forward_variables_from(invoker,
+                             [
+                               "args",
+                               "sources",
+                             ])
+      output = _main_dex_list_path
+      deps = invoker.deps
+    }
+  }
+
   assert(defined(invoker.output))
   action(target_name) {
     forward_variables_from(invoker,
                            [
                              "deps",
                              "inputs",
                              "sources",
                              "testonly",
                            ])
     script = "//build/android/gyp/dex.py"
@@ skipping 15 matching lines @@
     ]
 
     if (enable_incremental_dx) {
       args += [ "--incremental" ]
     }
 
     if (defined(invoker.no_locals) && invoker.no_locals) {
       args += [ "--no-locals=1" ]
     }
 
+    if (defined(invoker.multidex) && invoker.multidex) {
+      args += [
+        "--multi-dex",
+        "--main-dex-list-path",
+        rebase_path(_main_dex_list_path, root_build_dir),
+      ]
+      deps += [ ":${_main_dex_list_target_name}" ]
+      inputs += [ _main_dex_list_path ]
+    }
+
     if (defined(invoker.args)) {
       args += invoker.args
     }
 
     if (defined(invoker.sources)) {
       args += rebase_path(invoker.sources, root_build_dir)
     }
   }
 }
 
@@ skipping 1512 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }