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

tools-webrtc/ios/build_ios_libs.py

Index: tools-webrtc/ios/build_ios_libs.py
diff --git a/tools-webrtc/ios/build_ios_libs.py b/tools-webrtc/ios/build_ios_libs.py
index 550c7a1b70bcda95f7329d8319a3d7758be2c83c..92e126f9377c8943241bf64bf976e645b51295cc 100755
--- a/tools-webrtc/ios/build_ios_libs.py
+++ b/tools-webrtc/ios/build_ios_libs.py
@@ -58,6 +58,8 @@ def _ParseArgs():
       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.

 
 
@@ -74,7 +76,7 @@ def _CleanArtifacts(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']
@@ -96,6 +98,7 @@ def BuildWebRTC(output_dir, target_arch, flavor, build_type,
 
   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)
 
@@ -139,7 +142,7 @@ def main():
   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.
@@ -148,7 +151,7 @@ def main():
   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)