|
149 | 149 | _SUPPORTED_XCODE_CONFIGURATIONS = (
|
150 | 150 | "ReleaseForRunning", "Release", "Debug", "ReleaseForProfiling")
|
151 | 151 |
|
| 152 | +_DEFAULT_TIMEOUT_SECONDS = 1200 |
| 153 | + |
152 | 154 | FLAGS = flags.FLAGS
|
153 | 155 |
|
154 | 156 | flags.DEFINE_list(
|
@@ -643,14 +645,19 @@ def run_xcodebuild(dir_helper, ios_config, device_type, target_os):
|
643 | 645 | build_output_dir = os.path.join(dir_helper.output_dir, "tvos_output_"+device_type)
|
644 | 646 | else:
|
645 | 647 | build_output_dir = os.path.join(dir_helper.output_dir, "ios_output_"+device_type)
|
| 648 | + if "firestore" in dir_helper.unity_project_assets_dir.lower(): |
| 649 | + timeout_seconds = 1800 |
| 650 | + else: |
| 651 | + timeout_seconds = _DEFAULT_TIMEOUT_SECONDS |
646 | 652 | _run(
|
647 | 653 | xcodebuild.get_args_for_build(
|
648 | 654 | path=dir_helper.xcode_path,
|
649 | 655 | scheme=ios_config.scheme,
|
650 | 656 | output_dir=build_output_dir,
|
651 | 657 | ios_sdk=_IOS_SDK[device_type],
|
652 | 658 | target_os=target_os,
|
653 |
| - configuration=ios_config.configuration)) |
| 659 | + configuration=ios_config.configuration), |
| 660 | + timeout=timeout_seconds) |
654 | 661 | if device_type == _DEVICE_REAL:
|
655 | 662 | xcodebuild.generate_unsigned_ipa(
|
656 | 663 | output_dir=build_output_dir,
|
@@ -1091,7 +1098,7 @@ def _fix_path(path):
|
1091 | 1098 | return os.path.abspath(os.path.expanduser(path))
|
1092 | 1099 |
|
1093 | 1100 |
|
1094 |
| -def _run(args, timeout=1200, capture_output=False, text=None, check=True): |
| 1101 | +def _run(args, timeout=_DEFAULT_TIMEOUT_SECONDS, capture_output=False, text=None, check=True): |
1095 | 1102 | """Executes a command in a subprocess."""
|
1096 | 1103 | logging.info("Running in subprocess: %s", " ".join(args))
|
1097 | 1104 | return subprocess.run(
|
|
0 commit comments