[Cronet] Better GN for Cronet on iOS.

components/cronet/tools/cr_cronet.py

 #!/usr/bin/python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 cr_cronet.py - cr - like helper tool for cronet developers
 """
 
 import argparse
@@ skipping 62 matching lines @@
 
   options, extra_options_list = parser.parse_known_args()
   print options
   print extra_options_list
 
   is_os = (sys.platform == 'darwin')
   if is_os:
     target_os = 'ios'
     test_target = 'cronet_test'
     gn_args = 'target_cpu = "x64" '
+    gn_extra = '--ide=xcode'
     out_dir_suffix = '-iphonesimulator'
     if options.iphoneos:
       gn_args = 'target_cpu = "arm64" '
       out_dir_suffix = '-iphoneos'
   else:
     target_os = 'android'
     test_target = 'cronet_test_instrumentation_apk'
     gn_args = 'use_errorprone_java_compiler=true '
+    gn_extra = ''
     out_dir_suffix = ''
 
   gyp_defines = 'GYP_DEFINES="OS=' + target_os + ' enable_websockets=0 '+ \
       'disable_file_support=1 disable_ftp_support=1 '+ \
       'enable_errorprone=1 use_platform_icu_alternatives=1 ' + \
       'disable_brotli_filter=1"'
   gn_args += 'target_os="' + target_os + '" enable_websockets=false '+ \
       'disable_file_support=true disable_ftp_support=true '+ \
       'use_platform_icu_alternatives=true '+ \
       'disable_brotli_filter=true'
 
   extra_options = ' '.join(extra_options_list)
   if options.gn:
     out_dir_suffix += "-gn"
 
   if options.release:
     out_dir = 'out/Release' + out_dir_suffix
     release_arg = ' --release'
     gn_args += ' is_debug=false '
   else:
     out_dir = 'out/Debug' + out_dir_suffix
     release_arg = ''
 
   if options.out_dir:
     out_dir = options.out_dir
 
   if (options.command=='gyp'):
     return run (gyp_defines + ' gclient runhooks')
   if (options.command=='gn'):
-    return run ('gn gen ' + out_dir + ' --args=\'' + gn_args + '\'')
+    return run ('gn gen %s --args=\'%s\' %s' % (out_dir, gn_args, gn_extra))
   if (options.command=='sync'):
     return run ('git pull --rebase && ' + gyp_defines + ' gclient sync')
   if (options.command=='build'):
     return build(out_dir, test_target, extra_options)
   if (not is_os):
     if (options.command=='install'):
       return install(out_dir, release_arg)
     if (options.command=='proguard'):
       return run ('ninja -C ' + out_dir + ' cronet_sample_proguard_apk')
     if (options.command=='test'):
@@ skipping 13 matching lines @@
       return test_ios(out_dir, extra_options)
     if (options.command=='build-test'):
       return build(out_dir, test_target) or test_ios(out_dir, extra_options)
 
   parser.print_help()
   return 1
 
 
 if __name__ == '__main__':
   sys.exit(main())