Add support for extra GN args to Android build script.

tools-webrtc/android/build_aar.py

 #!/usr/bin/env python
 
 # Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
@@ skipping 36 matching lines @@
 def _ParseArgs():
   parser = argparse.ArgumentParser(description='libwebrtc.aar generator.')
   parser.add_argument('--output', default='libwebrtc.aar',
       help='Output file of the script.')
   parser.add_argument('--arch', action='append', default=[],
       help='Architectures to build. Defaults to ' + str(DEFAULT_ARCHS))
   parser.add_argument('--use-goma', action='store_true', default=False,
       help='Use goma.')
   parser.add_argument('--verbose', action='store_true', default=False,
       help='Debug logging.')
+  parser.add_argument('--extra-gn-args', action='append', default=[],

[sakal, 2017/02/06 09:24:11]

I would prefer this be a regular string parameter. You can pass multiple
parameters:
--extra-gn-args='is_debug=false is_component_build=true'

[kjellander_webrtc, 2017/02/06 14:44:12]

Since I have action='append' it is possible to pass multiple arguments by
specifying the same flag multiple times, like --extra-gn-args=foo=\"bar\"
--extra-gn-args='baz=\"wee\"
I think that's better than string.
I tried passing two flags as a string and it actually also works:
--extra-gn-args='goma_dir="/usr/local/google/home/kjellander/goma" foo="bar"'

See https://docs.python.org/2.7/library/argparse.html#action for more info.

[sakal, 2017/02/06 14:52:57]

I find passing arguments one by one a little cumbersome but if you prefer it ok.

+      help='Additional GN args to be used during Ninja generation.')
   return parser.parse_args()
 
 
 def _RunGN(args):
   cmd = ['gn']
   cmd.extend(args)
   logging.debug('Running: %r', cmd)
   subprocess.check_call(cmd)
 
 
@@ skipping 34 matching lines @@
   if arch == 'armeabi':
     return 6
   elif arch == 'armeabi-v7a':
     return 7
   elif arch == 'x86':
     return None
   else:
     raise Exception('Unknown arch: ' + arch)
 
 
-def Build(tmp_dir, arch, use_goma):
+def Build(tmp_dir, arch, use_goma, extra_gn_args):
   """Generates target architecture using GN and builds it using ninja."""
   logging.info('Building: %s', arch)
   output_directory = _GetOutputDirectory(tmp_dir, arch)
   gn_args = {
     'target_os': 'android',
     'is_debug': False,
     'is_component_build': False,
     'target_cpu': _GetTargetCpu(arch),
     'use_goma': use_goma
   }
   arm_version = _GetArmVersion(arch)
   if arm_version:
     gn_args['arm_version'] = arm_version
   gn_args_str = '--args=' + ' '.join([
-      k + '=' + _EncodeForGN(v) for k, v in gn_args.items()])
+      k + '=' + _EncodeForGN(v) for k, v in gn_args.items()] + extra_gn_args)

[sakal, 2017/02/06 09:24:11]

I would prefer a system where you can override existing args but if that is too
much work this is ok.

[kjellander_webrtc, 2017/02/06 14:44:12]

argparse doesn't support dicts, so I think it's a little too much work,
unfortunately.

[sakal, 2017/02/06 14:52:57]

Yeah, you would have to manually parse the list into a dictionary. Let's keep as
is then.

 
   _RunGN(['gen', output_directory, gn_args_str])
 
   ninja_args = TARGETS
   if use_goma:
     ninja_args.extend(['-j', '1024'])
   _RunNinja(output_directory, ninja_args)
 
 
 def CollectCommon(aar_file, tmp_dir, arch):
@@ skipping 18 matching lines @@
 def main():
   args = _ParseArgs()
   if not args.arch:
     args.arch = DEFAULT_ARCHS
 
   logging.basicConfig(level=logging.DEBUG if args.verbose else logging.INFO)
 
   tmp_dir = tempfile.mkdtemp()
 
   for arch in args.arch:
-    Build(tmp_dir, arch, args.use_goma)
+    Build(tmp_dir, arch, args.use_goma, args.extra_gn_args)
 
   with zipfile.ZipFile(args.output, 'w') as aar_file:
     # Architecture doesn't matter here, arbitrarily using the first one.
     CollectCommon(aar_file, tmp_dir, args.arch[0])
     for arch in args.arch:
       Collect(aar_file, tmp_dir, arch)
 
   shutil.rmtree(tmp_dir, True)
 
 
 if __name__ == '__main__':
   sys.exit(main())