Remove all references to hermetic_xcode_path on ios.

We never use hermetic xcode on iOS.

Change-Id: Id0a7655415e60453479caf5a9581ccf5077c2d4a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1650321Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Misha Efimov <mef@chromium.org>
Commit-Queue: Erik Chen <erikchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#667310}

build/config/ios/find_signing_identity.py

@@ -35,15 +35,10 @@ def FindValidIdentity(identity_description):
 
 if __name__ == '__main__':
   parser = argparse.ArgumentParser('codesign iOS bundles')
-  parser.add_argument(
-      '--developer_dir', required=False,
-      help='Path to Xcode.')
   parser.add_argument(
       '--identity-description', required=True,
       help='Text description used to select the code signing identity.')
   args = parser.parse_args()
-  if args.developer_dir:
-    os.environ['DEVELOPER_DIR'] = args.developer_dir
 
   for identity in FindValidIdentity(args.identity_description):
     print(identity)

build/config/ios/ios_sdk.gni

@@ -5,6 +5,8 @@
 import("//build/config/ios/ios_sdk_overrides.gni")
 import("//build/toolchain/toolchain.gni")
 
+assert(use_system_xcode, "Hermetic xcode doesn't work for ios.")
+
 declare_args() {
   # SDK path to use. When empty this will use the default SDK based on the
   # value of use_ios_simulator.
@@ -89,12 +91,6 @@ if (ios_sdk_path == "") {
   }
 
   ios_sdk_info_args = [ "--get_sdk_info" ]
-  if (!use_system_xcode) {
-    ios_sdk_info_args += [
-      "--developer_dir",
-      hermetic_xcode_path,
-    ]
-  }
   ios_sdk_info_args += [ ios_sdk_name ]
   script_name = "//build/config/mac/sdk_info.py"
   _ios_sdk_result = exec_script(script_name, ios_sdk_info_args, "scope")
@@ -120,12 +116,6 @@ if (ios_enable_code_signing && !use_ios_simulator) {
     "--identity-description",
     ios_code_signing_identity_description,
   ]
-  if (!use_system_xcode) {
-    find_signing_identity_args += [
-      "--developer_dir",
-      hermetic_xcode_path,
-    ]
-  }
 
   # If an identity is not provided, look for one on the host
   if (ios_code_signing_identity == "") {

build/config/ios/rules.gni

@@ -84,20 +84,13 @@ template("lipo_binary") {
       deps += [ "$_arch_binary_target($_toolchain)" ]
     }
 
-    args = []
-    if (!use_system_xcode) {
-      args += [
-        "--developer_dir",
-        hermetic_xcode_path,
-      ]
-    }
-    args += [
-              "xcrun",
-              "lipo",
-              "-create",
-              "-output",
-              rebase_path("$target_out_dir/$_output_name", root_build_dir),
-            ] + rebase_path(inputs, root_build_dir)
+    args = [
+             "xcrun",
+             "lipo",
+             "-create",
+             "-output",
+             rebase_path("$target_out_dir/$_output_name", root_build_dir),
+           ] + rebase_path(inputs, root_build_dir)
 
     if (enable_dsyms) {
       _dsyms_output_dir = "$root_out_dir/$_output_name.dSYM"
@@ -351,14 +344,7 @@ template("create_signed_bundle") {
       }
     }
 
-    code_signing_args = []
-    if (!use_system_xcode) {
-      code_signing_args += [
-        "--developer_dir",
-        hermetic_xcode_path,
-      ]
-    }
-    code_signing_args += [
+    code_signing_args = [
       "code-sign-bundle",
       "-t=" + ios_sdk_name,
       "-i=" + ios_code_signing_identity,
@@ -768,18 +754,11 @@ template("ios_app_bundle") {
           _generate_entitlements_output,
         ]
 
-        args = []
-        if (!use_system_xcode) {
-          args += [
-            "--developer_dir",
-            hermetic_xcode_path,
-          ]
-        }
-        args += [
-                  "generate-entitlements",
-                  "-e=" + rebase_path(_entitlements_path, root_build_dir),
-                  "-p=" + rebase_path(_info_plist_path, root_build_dir),
-                ] + rebase_path(outputs, root_build_dir)
+        args = [
+                 "generate-entitlements",
+                 "-e=" + rebase_path(_entitlements_path, root_build_dir),
+                 "-p=" + rebase_path(_info_plist_path, root_build_dir),
+               ] + rebase_path(outputs, root_build_dir)
       }
     }
 
@@ -1011,12 +990,6 @@ template("compile_ib_files") {
           "$target_gen_dir/$target_name/{{source_name_part}}.$_output_extension",
           root_build_dir),
     ]
-    if (!use_system_xcode) {
-      args += [
-        "--developer_dir",
-        hermetic_xcode_path,
-      ]
-    }
     args += ibtool_flags
   }
 }

components/cronet/ios/BUILD.gn

@@ -226,13 +226,6 @@ action("cronet_static_complete") {
     args += [ "--use_custom_libcxx" ]
   }
 
-  if (!use_system_xcode) {
-    args += [
-      "--developer_dir",
-      hermetic_xcode_path,
-    ]
-  }
-
   public_configs = [ ":cronet_static_config" ]
 }
 

components/cronet/tools/hide_symbols.py

@@ -55,18 +55,11 @@ def main():
   parser.add_option(
       '--use_custom_libcxx', default=False, action='store_true',
       help='Confirm there is a custom libc++ linked in.')
-  parser.add_option(
-      '--developer_dir',
-      help='Path to Xcode.')
   (options, args) = parser.parse_args()
   assert not args
 
-  if options.developer_dir:
-    os.environ['DEVELOPER_DIR'] = options.developer_dir
-    developer_dir = options.developer_dir + '/Contents/Developer'
-  else:
-    developer_dir = subprocess.check_output(
-        ['xcode-select', '--print-path']).strip()
+  developer_dir = subprocess.check_output(
+      ['xcode-select', '--print-path']).strip()
 
   xctoolchain_libs = glob.glob(developer_dir
       + '/Toolchains/XcodeDefault.xctoolchain/usr/lib'