Adding --use-goma and --extra-gn-args flags to build_ios_libs.py

tools-webrtc/ios/build_ios_libs.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 40 matching lines @@
       help='Removes the previously generated build output, if any.')
   parser.add_argument('-o', '--output-dir', default=SDK_OUTPUT_DIR,
       help='Specifies a directory to output the build artifacts to. '
            'If specified together with -c, deletes the dir.')
   parser.add_argument('-r', '--revision', type=int, default=0,
       help='Specifies a revision number to embed if building the framework.')
   parser.add_argument('-e', '--bitcode', action='store_true', default=False,
       help='Compile with bitcode.')
   parser.add_argument('--verbose', action='store_true', default=False,
       help='Debug logging.')
+  parser.add_argument('--use-goma', action='store_true', default=False,
+      help='Use goma to build.')
   return parser.parse_args()

[kjellander_webrtc, 2017/02/13 07:21:05]

For the bots, we'll need another flag --extra-gn-args as well, similar to
https://chromium.googlesource.com/external/webrtc/+/master/tools-webrtc/andro...

That's because they need to pass a the goma_dir variable, since the bot's don't
use the default location for Goma.
We could pass use_goma=True to that one as well, but let's keep --use-goma for
better visibility to regular end-users (and to align with
tools-webrtc/android/build_aar.py).

[mbonadei, 2017/02/13 10:21:35]

Done.

 
 
 def _RunCommand(cmd):
   logging.debug('Running: %r', cmd)
   subprocess.check_call(cmd)
 
 
 def _CleanArtifacts(output_dir):
   if os.path.isdir(output_dir):
     logging.info('Deleting %s', output_dir)
     shutil.rmtree(output_dir)
 
 
 def BuildWebRTC(output_dir, target_arch, flavor, build_type,
                 ios_deployment_target, libvpx_build_vp9, use_bitcode,
-                custom_gn_options=()):
+                use_goma, custom_gn_options=()):
   output_dir = os.path.join(output_dir, target_arch + '_libs')
   gn_args = ['target_os="ios"', 'ios_enable_code_signing=false',
              'use_xcode_clang=true', 'is_component_build=false']
 
   # Add flavor option.
   if flavor == 'debug':
     gn_args.append('is_debug=true')
   elif flavor == 'release':
     gn_args.append('is_debug=false')
   else:
     raise ValueError('Unexpected flavor type: %s' % flavor)
 
   gn_args.append('target_cpu="%s"' % target_arch)
 
   gn_args.append('ios_deployment_target="%s"' % ios_deployment_target)
 
   gn_args.append('rtc_libvpx_build_vp9=' +
                  ('true' if libvpx_build_vp9 else 'false'))
 
   gn_args.append('enable_ios_bitcode=' +
                  ('true' if use_bitcode else 'false'))
+  gn_args.append('use_goma=' + 'true' if use_goma else 'false')
 
   gn_args.extend(custom_gn_options)
 
   # Generate static or dynamic.
   if build_type == 'static_only':
     gn_target_name = 'rtc_sdk_objc'
   elif build_type == 'framework':
     gn_target_name = 'rtc_sdk_framework_objc'
     gn_args.append('enable_dsyms=true')
     gn_args.append('enable_stripping=true')
@@ skipping 23 matching lines @@
   logging.basicConfig(level=logging.DEBUG if args.verbose else logging.INFO)
 
   if args.clean:
     _CleanArtifacts(args.output_dir)
     return 0
 
   # Build all architectures.
   for arch in ENABLED_ARCHITECTURES:
     BuildWebRTC(args.output_dir, arch, args.build_config, args.build_type,
                 IOS_DEPLOYMENT_TARGET, LIBVPX_BUILD_VP9, args.bitcode,
-                CUSTOM_GN_OPTS)
+                args.use_goma, CUSTOM_GN_OPTS)
 
   # Ignoring x86 except for static libraries for now because of a GN build issue
   # where the generated dynamic framework has the wrong architectures.
 
   # Create FAT archive.
   if args.build_type == 'static_only':
     BuildWebRTC(args.output_dir, 'x86', args.build_config, args.build_type,
                 IOS_DEPLOYMENT_TARGET, LIBVPX_BUILD_VP9, args.bitcode,
-                CUSTOM_GN_OPTS)
+                args.use_goma, CUSTOM_GN_OPTS)
 
     arm_lib_path = os.path.join(args.output_dir, 'arm_libs', SDK_LIB_NAME)
     arm64_lib_path = os.path.join(args.output_dir, 'arm64_libs', SDK_LIB_NAME)
     x64_lib_path = os.path.join(args.output_dir, 'x64_libs', SDK_LIB_NAME)
     x86_lib_path = os.path.join(args.output_dir, 'x86_libs', SDK_LIB_NAME)
 
     # Combine the slices.
     cmd = ['lipo', arm_lib_path, arm64_lib_path, x64_lib_path, x86_lib_path,
            '-create', '-output', os.path.join(args.output_dir, SDK_LIB_NAME)]
     _RunCommand(cmd)
@@ skipping 50 matching lines @@
            'Set :CFBundleVersion ' + version_number, infoplist_path]
     _RunCommand(cmd)
     _RunCommand(['plutil', '-convert', 'binary1', infoplist_path])
 
   logging.info('Done.')
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())