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 30 matching lines @@
 TARGETS = [
   'webrtc/sdk/android:libwebrtc',
   'webrtc/sdk/android:libjingle_peerconnection_so',
 ]
 
 
 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('--arch', action='append', default=DEFAULT_ARCHS,

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

I fixed this for you.

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

Nice if this works but I think I tested this already. Can you try passing in
"--arch" argument. In my testing it was appended to the default values.

[kjellander_webrtc, 2017/02/07 08:02:58]

You're right (I didn't test it properly). action needs to be set to the default
('store') and use the nargs attribute as well. Having append here will only
append to the default value, which is not what we want!

I tested PS#3 by passing --arch x86
then by passing --arch x86 armv7a
then by not passing it at all.
All worked as expected.

+      help='Architectures to build. Defaults to %(default)s.')
   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=[],
+      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)
 
   _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 10 matching lines @@
   output_directory = _GetOutputDirectory(tmp_dir, arch)
 
   abi_dir = os.path.join('jni', arch)
   for so_file in NEEDED_SO_FILES:
     aar_file.write(os.path.join(output_directory, so_file),
                    os.path.join(abi_dir, so_file))
 
 
 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())