[Android] Add gn support for multidex.

build/android/gyp/dex.py

Index: build/android/gyp/dex.py
diff --git a/build/android/gyp/dex.py b/build/android/gyp/dex.py
index 2fef369dca87e8211a254f2c0234c926ceb48c25..2f11348dc20010ec73d2b74747a876106dabb7cf 100755
--- a/build/android/gyp/dex.py
+++ b/build/android/gyp/dex.py
@@ -60,13 +60,13 @@ def _ParseArgs(args):
                          'include in the main dex.')
   parser.add_option('--multidex-configuration-path',
                     help='A JSON file containing multidex build configuration.')
+  parser.add_option('--multi-dex', default=False, action='store_true')

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

nit: Add help text?

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

Done.

 
   options, paths = parser.parse_args(args)
 
   required_options = ('android_sdk_tools',)
   build_utils.CheckOptions(options, parser, required=required_options)
 
-  options.multi_dex = False
   if options.multidex_configuration_path:
     with open(options.multidex_configuration_path) as multidex_config_file:
       multidex_config = json.loads(multidex_config_file.read())