[iOS] Always generate the final binaries using lipo.

build/config/ios/rules.gni

 # Copyright 2015 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.
 
 import("//build/config/ios/ios_sdk.gni")
 import("//build/config/mac/base_rules.gni")
 import("//build/config/mac/symbols.gni")
 
-_is_fat_build = additional_toolchains != []
-if (_is_fat_build) {
-  _is_fat_build_main_target = current_toolchain == default_toolchain
-}
+_is_secondary_build =
+    additional_toolchains != [] && current_toolchain != default_toolchain
 
 _code_signing_script_path = "//build/config/ios/codesign.py"
 _default_entitlements_path = "//build/config/ios/entitlements.plist"
 
 # Generates Info.plist files for Mac apps and frameworks.
 #
 # Arguments
 #
 #     info_plist:
 #         (optional) string, path to the Info.plist file that will be used for
@@ skipping 155 matching lines @@
       "-sectcreate",
       "-Xlinker",
       "__TEXT",
       "-Xlinker",
       "__entitlements",
       "-Xlinker",
       rebase_path(_generate_entitlements_output, root_build_dir),
     ]
   }
 
-  if (_is_fat_build && !_is_fat_build_main_target) {
+  if (_is_secondary_build) {
     # For the non-default toolchain of a fat-build, the template expands to a
     # single "executable" target that creates "$root_out_dir/$_output_name".
     executable(_target_name) {
       forward_variables_from(invoker,
                              "*",
                              [
                                "bundle_deps",
                                "bundle_deps_filter",
                                "bundle_extension",
                                "entitlements_path",
@@ skipping 86 matching lines @@
           _generate_entitlements_output,
         ]
         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)
       }
     }
 
-    _link_executable = _target_name + "_executable"
-    _link_executable_visibility = [ ":$_target_name" ]
+    _link_executable = _target_name + "_arch_executable"
+    _lipo_executable = _target_name + "_executable"
 
-    # For a fat-build, the different "executable" outputs will be used to
-    # create the final binary using "lipo". As the corresponding target has
-    # the same role as the "executable" target in a thin build, copy the
-    # visibility and redefine some variables.
-    if (_is_fat_build) {
-      _lipo_executable = _link_executable
-      _lipo_executable_visibility = _link_executable_visibility
-
-      _link_executable_visibility = []
-      _link_executable_visibility = [ ":$_lipo_executable" ]
-      _link_executable = _target_name + "_arch_executable"
-    }
+    _link_executable_visibility = [ ":$_lipo_executable" ]
+    _lipo_executable_visibility = [ ":$_target_name" ]
 
     executable(_link_executable) {
       forward_variables_from(invoker,
                              "*",
                              [
                                "bundle_deps",
                                "bundle_deps_filter",
                                "bundle_extension",
                                "data_deps",
                                "entitlements_path",
                                "extra_substitutions",
                                "extra_system_frameworks",
                                "info_plist",
                                "info_plist_target",
                                "output_name",
                                "product_type",
                                "visibility",
                              ])
 
       visibility = _link_executable_visibility
 
       output_name = _output_name
       output_prefix_override = true
-      if (_is_fat_build) {
-        output_dir = "$target_out_dir/$current_cpu"
-      } else {
-        output_dir = target_out_dir
-      }
+      output_dir = "$target_out_dir/$current_cpu"
 
       if (!defined(deps)) {
         deps = []
       }
       deps += _executable_extra_deps
 
       if (!defined(ldflags)) {
         ldflags = []
       }
       ldflags += _executable_extra_ldflags
 
       if (!defined(inputs)) {
         inputs = []
       }
       inputs += _executable_extra_inputs
 
       if (!defined(libs)) {
         libs = []
       }
       libs += [ "UIKit.framework" ]
     }
 
-    if (_is_fat_build) {
-      # Create the multi-architecture binary from all the single architecture
-      # binaries using "lipo". This target exists for the default toolchain
-      # of a fat-build only and depends on the expansion of "ios_app_bundle"
-      # for the other toolchains (i.e. a single "executable" target).
-      #
-      # This action only happens once per "ios_app_bundle" template (for the
-      # main toolchain).
-      action(_lipo_executable) {
-        forward_variables_from(invoker, [ "testonly" ])
-        visibility = _lipo_executable_visibility
-        script = "//build/toolchain/mac/linker_driver.py"
-        outputs = [
-          "$target_out_dir/$_output_name",
+    # Create the multi-architecture binary from all the single architecture
+    # binaries using "lipo". This target exists for the default toolchain
+    # of a fat-build only and depends on the expansion of "ios_app_bundle"
+    # for the other toolchains (i.e. a single "executable" target).
+    #
+    # This action only happens once per "ios_app_bundle" template (for the
+    # main toolchain).
+    action(_lipo_executable) {
+      forward_variables_from(invoker, [ "testonly" ])
+      visibility = _lipo_executable_visibility
+      script = "//build/toolchain/mac/linker_driver.py"
+      outputs = [
+        "$target_out_dir/$_output_name",
+      ]
+      inputs = [
+        "$target_out_dir/$current_cpu/$_output_name",
+      ]
+      deps = [
+        ":$_link_executable",
+      ]
+      foreach(_additional_toolchain, additional_toolchains) {
+        _additional_toolchain_target = "$_target_name($_additional_toolchain)"
+        deps += [ ":$_additional_toolchain_target" ]
+        inputs += [ get_label_info(_additional_toolchain_target,
+                                   "root_out_dir") + "/$_output_name" ]
+      }
+      args = [
+               "xcrun",
+               "lipo",
+               "-create",
+               "-output",
+               rebase_path(outputs[0], root_build_dir),
+             ] + rebase_path(inputs, root_build_dir)
+
+      if (enable_dsyms) {
+        _dsyms_dir = "$root_out_dir/$_output_name.dSYM/"
+        outputs += [
+          "$_dsyms_dir/",
+          "$_dsyms_dir/Contents/Info.plist",
+          "$_dsyms_dir/Contents/Resources/DWARF/$_output_name",
         ]
-        inputs = [
-          "$target_out_dir/$current_cpu/$_output_name",
-        ]
-        deps = [
-          ":$_link_executable",
-        ]
-        foreach(_additional_toolchain, additional_toolchains) {
-          _additional_toolchain_target = "$_target_name($_additional_toolchain)"
-          deps += [ ":$_additional_toolchain_target" ]
-          inputs += [ get_label_info(_additional_toolchain_target,
-                                     "root_out_dir") + "/$_output_name" ]
-        }
-        args = [
-                 "xcrun",
-                 "lipo",
-                 "-create",
-                 "-output",
-                 rebase_path(outputs[0], root_build_dir),
-               ] + rebase_path(inputs, root_build_dir)
+        args +=
+            [ "-Wcrl,dsym," + rebase_path("$root_out_dir/.", root_build_dir) ]
+      }
 
-        if (enable_dsyms) {
-          _dsyms_dir = "$root_out_dir/$_output_name.dSYM/"
-          outputs += [
-            "$_dsyms_dir/",
-            "$_dsyms_dir/Contents/Info.plist",
-            "$_dsyms_dir/Contents/Resources/DWARF/$_output_name",
-          ]
-          args +=
-              [ "-Wcrl,dsym," + rebase_path("$root_out_dir/.", root_build_dir) ]
-        }
-
-        if (enable_stripping) {
-          # Check whether //build/config/mac:strip_all has been removed from
-          # the configs variable (as this is how stripping is disabled for a
-          # single target).
-          _strip_all_in_config = false
-          if (defined(invoker.configs)) {
-            foreach(_config, invoker.configs) {
-              if (_config == "//build/config/mac:strip_all") {
-                _strip_all_in_config = true
-              }
-            }
-          }
-
-          if (_strip_all_in_config) {
-            args += [ "-Wcrl,strip,-x,-S" ]
-
-            if (save_unstripped_output) {
-              outputs += [ outputs[0] + ".unstripped" ]
-              args += [ "-Wcrl,unstripped," +
-                        rebase_path(get_path_info(outputs[0], "dir"),
-                                    root_build_dir) ]
+      if (enable_stripping) {
+        # Check whether //build/config/mac:strip_all has been removed from
+        # the configs variable (as this is how stripping is disabled for a
+        # single target).
+        _strip_all_in_config = false
+        if (defined(invoker.configs)) {
+          foreach(_config, invoker.configs) {
+            if (_config == "//build/config/mac:strip_all") {
+              _strip_all_in_config = true
             }
           }
         }
+
+        if (_strip_all_in_config) {
+          args += [ "-Wcrl,strip,-x,-S" ]
+
+          if (save_unstripped_output) {
+            outputs += [ outputs[0] + ".unstripped" ]
+            args += [ "-Wcrl,unstripped," +
+                      rebase_path(get_path_info(outputs[0], "dir"),
+                                  root_build_dir) ]
+          }
+        }
       }
     }
 
     create_bundle(target_name) {
       forward_variables_from(invoker,
                              [
                                "bundle_deps_filter",
                                "data_deps",
                                "deps",
                                "public_deps",
                                "testonly",
                                "visibility",
                              ])
 
       if (!defined(deps)) {
         deps = []
       }
       deps += [ ":$_bundle_data_info_plist" ]
       if (!defined(public_deps)) {
         public_deps = []
       }
-      if (_is_fat_build) {
-        public_deps += [ ":$_lipo_executable" ]
-      } else {
-        public_deps += [ ":$_link_executable" ]
-      }
+      public_deps += [ ":$_lipo_executable" ]
       if (defined(invoker.bundle_deps)) {
         deps += invoker.bundle_deps
       }
 
       if (use_ios_simulator) {
         if (!defined(data_deps)) {
           data_deps = []
         }
         data_deps += [ "//testing/iossim" ]
       }
@@ skipping 376 matching lines @@
   #
   # For a fat build, the template just expands to the "shared_library" target
   # for the non-default toolchain, while the final library is created using
   # "lipo" in the expansion of the template for the default toolchain.
   #
   # The "$target_name+link" group for the non-default toolchain depends on the
   # target of the same name from the default toolchain as this is the target
   # that defines the real framework bundle (it will support the current cpu
   # as it is a fat framework).
 
-  if (_is_fat_build && !_is_fat_build_main_target) {
+  if (_is_secondary_build) {
     shared_library(_target_name) {
       forward_variables_from(invoker,
                              "*",
                              [
                                "assert_no_deps",
                                "bundle_deps",
                                "data_deps",
                                "info_plist",
                                "info_plist_target",
                                "output_name",
@@ skipping 120 matching lines @@
     # the versioned directory structure.
     _framework_target = _target_name
     _framework_name = _output_name + ".framework"
     _framework_root_dir = "$root_out_dir/$_framework_name"
     if (defined(invoker.framework_version) && invoker.framework_version != "") {
       _framework_version = invoker.framework_version
       _framework_root_dir += "/Versions/$_framework_version"
       _framework_target = _target_name + "_create_bundle"
     }
 
-    _link_shared_library_target = target_name + "_shared_library"
-    _shared_library_dir = "$target_out_dir/$_link_shared_library_target"
-    _link_shared_library_visibility = [ ":$_framework_target" ]
+    _link_shared_library_target = target_name + "_arch_shared_library"
+    _lipo_shared_library_target = target_name + "_shared_library"
 
-    if (_is_fat_build) {
-      _lipo_shared_library_target = _link_shared_library_target
-      _lipo_shared_library_visibility = _link_shared_library_visibility
+    _lipo_shared_library_visibility = [ ":$_framework_target" ]
+    _link_shared_library_visibility = [ ":$_lipo_shared_library_target" ]
 
-      _link_shared_library_visibility = []
-      _link_shared_library_visibility = [ ":$_lipo_shared_library_target" ]
-      _link_shared_library_target = target_name + "_arch_shared_library"
-
-      _arch_shared_library_dir = "$target_out_dir/$_link_shared_library_target"
-      _shared_library_dir = "$target_out_dir/$_lipo_shared_library_target"
-    }
+    _arch_shared_library_dir = "$target_out_dir/$_link_shared_library_target"
+    _shared_library_dir = "$target_out_dir/$_lipo_shared_library_target"
 
     shared_library(_link_shared_library_target) {
       forward_variables_from(invoker,
                              "*",
                              [
                                "assert_no_deps",
                                "bundle_deps",
                                "data_deps",
                                "info_plist",
                                "info_plist_target",
                                "output_name",
                                "visibility",
                              ])
       visibility = _link_shared_library_visibility
       output_name = _output_name
       output_prefix_override = true
       output_extension = ""
-
-      if (!_is_fat_build) {
-        output_dir = _shared_library_dir
-      } else {
-        output_dir = _arch_shared_library_dir
-      }
+      output_dir = _arch_shared_library_dir
 
       if (_has_public_headers) {
         configs += [ ":$_headers_map_config($default_toolchain)" ]
 
         if (!defined(deps)) {
           deps = []
         }
         deps += [ ":$_framework_headers_target($default_toolchain)" ]
       }
     }
 
-    if (_is_fat_build) {
-      action(_lipo_shared_library_target) {
-        forward_variables_from(invoker, [ "testonly" ])
-        visibility = _lipo_shared_library_visibility
-        script = "//build/toolchain/mac/linker_driver.py"
-        outputs = [
-          "$_shared_library_dir/$_output_name",
+    action(_lipo_shared_library_target) {
+      forward_variables_from(invoker, [ "testonly" ])
+      visibility = _lipo_shared_library_visibility
+      script = "//build/toolchain/mac/linker_driver.py"
+      outputs = [
+        "$_shared_library_dir/$_output_name",
+      ]
+      inputs = [
+        "$_arch_shared_library_dir/$_output_name",
+      ]
+      deps = [
+        ":$_link_shared_library_target",
+      ]
+      foreach(_additional_toolchain, additional_toolchains) {
+        _additional_toolchain_target = "$_target_name($_additional_toolchain)"
+        deps += [ ":$_additional_toolchain_target" ]
+        inputs += [ get_label_info(_additional_toolchain_target,
+                                   "target_out_dir") + "/$_output_name" ]
+      }
+      args = [
+               "xcrun",
+               "lipo",
+               "-create",
+               "-output",
+               rebase_path(outputs[0], root_build_dir),
+             ] + rebase_path(inputs, root_build_dir)
+
+      if (enable_dsyms) {
+        _dsyms_dir = "$root_out_dir/$_output_name.dSYM/"
+        outputs += [
+          "$_dsyms_dir/",
+          "$_dsyms_dir/Contents/Info.plist",
+          "$_dsyms_dir/Contents/Resources/DWARF/$_output_name",
         ]
-        inputs = [
-          "$_arch_shared_library_dir/$_output_name",
-        ]
-        deps = [
-          ":$_link_shared_library_target",
-        ]
-        foreach(_additional_toolchain, additional_toolchains) {
-          _additional_toolchain_target = "$_target_name($_additional_toolchain)"
-          deps += [ ":$_additional_toolchain_target" ]
-          inputs += [ get_label_info(_additional_toolchain_target,
-                                     "target_out_dir") + "/$_output_name" ]
-        }
-        args = [
-                 "xcrun",
-                 "lipo",
-                 "-create",
-                 "-output",
-                 rebase_path(outputs[0], root_build_dir),
-               ] + rebase_path(inputs, root_build_dir)
+        args +=
+            [ "-Wcrl,dsym," + rebase_path("$root_out_dir/.", root_build_dir) ]
+      }
 
-        if (enable_dsyms) {
-          _dsyms_dir = "$root_out_dir/$_output_name.dSYM/"
-          outputs += [
-            "$_dsyms_dir/",
-            "$_dsyms_dir/Contents/Info.plist",
-            "$_dsyms_dir/Contents/Resources/DWARF/$_output_name",
-          ]
-          args +=
-              [ "-Wcrl,dsym," + rebase_path("$root_out_dir/.", root_build_dir) ]
-        }
-
-        if (enable_stripping) {
-          # Check whether //build/config/mac:strip_all has been removed from
-          # the configs variable (as this is how stripping is disabled for a
-          # single target).
-          _strip_all_in_config = false
-          if (defined(invoker.configs)) {
-            foreach(_config, invoker.configs) {
-              if (_config == "//build/config/mac:strip_all") {
-                _strip_all_in_config = true
-              }
-            }
-          }
-
-          if (_strip_all_in_config) {
-            args += [ "-Wcrl,strip,-x,-S" ]
-
-            if (save_unstripped_output) {
-              outputs += [ outputs[0] + ".unstripped" ]
-              args += [ "-Wcrl,unstripped," +
-                        rebase_path(get_path_info(outputs[0], "dir"),
-                                    root_build_dir) ]
+      if (enable_stripping) {
+        # Check whether //build/config/mac:strip_all has been removed from
+        # the configs variable (as this is how stripping is disabled for a
+        # single target).
+        _strip_all_in_config = false
+        if (defined(invoker.configs)) {
+          foreach(_config, invoker.configs) {
+            if (_config == "//build/config/mac:strip_all") {
+              _strip_all_in_config = true
             }
           }
         }
+
+        if (_strip_all_in_config) {
+          args += [ "-Wcrl,strip,-x,-S" ]
+
+          if (save_unstripped_output) {
+            outputs += [ outputs[0] + ".unstripped" ]
+            args += [ "-Wcrl,unstripped," +
+                      rebase_path(get_path_info(outputs[0], "dir"),
+                                  root_build_dir) ]
+          }
+        }
       }
     }
 
     _framework_public_config = _target_name + "_public_config"
     config(_framework_public_config) {
       # TODO(sdefresne): should we have a framework_dirs similar to lib_dirs
       # and include_dirs to avoid duplicate values on the command-line.
       visibility = [ ":$_framework_target" ]
       ldflags = [
         "-F",
@@ skipping 59 matching lines @@
         deps += invoker.bundle_deps
       }
 
       bundle_root_dir = _framework_root_dir
       bundle_resources_dir = "$bundle_root_dir/Resources"
       bundle_executable_dir = "$bundle_root_dir"
 
       if (!defined(deps)) {
         deps = []
       }
-
-      if (_is_fat_build) {
-        deps += [ ":$_lipo_shared_library_target" ]
-      } else {
-        deps += [ ":$_link_shared_library_target" ]
-      }
+      deps += [ ":$_lipo_shared_library_target" ]
 
       _entitlements_path = _default_entitlements_path
       if (defined(invoker.entitlements_path)) {
         _entitlements_path = invoker.entitlements_path
       }
 
       code_signing_script = _code_signing_script_path
       code_signing_sources = [
         _entitlements_path,
         "$_shared_library_dir/$_output_name",
@@ skipping 97 matching lines @@
   if (defined(invoker.output_name)) {
     _output_name = invoker.output_name
   }
 
   _xctest_target = _target_name
   _xctest_output = _output_name
 
   _host_target = _target_name + "_host"
   _host_output = _output_name + "_host"
 
-  if (_is_fat_build && !_is_fat_build_main_target) {
+  if (_is_secondary_build) {
     loadable_module(_xctest_target) {
       visibility = [ ":${_xctest_target}_loadable_module($default_toolchain)" ]
       sources = [
         "//build/config/ios/xctest_shell.mm",
       ]
       configs += [ "//build/config/ios:xctest_config" ]
 
       output_name = _xctest_output
       output_extension = ""
     }
@@ skipping 10 matching lines @@
       visibility = [ ":$_xctest_target" ]
       public_deps = [
         ":$_xctest_info_plist_target",
       ]
       sources = get_target_outputs(":$_xctest_info_plist_target")
       outputs = [
         "{{bundle_root_dir}}/Info.plist",
       ]
     }
 
-    _xctest_loadable_module_target = _xctest_target + "_loadable_module"
-    _xctest_loadable_module_visibility = [ ":$_xctest_target" ]
+    _xctest_loadable_module_target = _xctest_target + "_arch_loadable_module"
+    _xctest_lipo_loadable_module_target = _xctest_target + "_loadable_module"
 
-    if (_is_fat_build) {
-      _xctest_lipo_loadable_module_target = _xctest_loadable_module_target
-      _xctest_lipo_loadable_module_visibility =
-          _xctest_loadable_module_visibility
-
-      _xctest_loadable_module_visibility = []
-      _xctest_loadable_module_visibility =
-          [ ":$_xctest_lipo_loadable_module_target" ]
-      _xctest_loadable_module_target = _xctest_target + "_arch_loadable_module"
-    }
+    _xctest_loadable_module_visibility =
+        [ ":$_xctest_lipo_loadable_module_target" ]
+    _xctest_lipo_loadable_module_visibility = [ ":$_xctest_target" ]
 
     loadable_module(_xctest_loadable_module_target) {
       visibility = _xctest_loadable_module_visibility
       sources = [
         "//build/config/ios/xctest_shell.mm",
       ]
       configs += [ "//build/config/ios:xctest_config" ]
 
-      if (_is_fat_build) {
-        output_dir = "$target_out_dir/$current_cpu"
-      } else {
-        output_dir = target_out_dir
-      }
-
+      output_dir = "$target_out_dir/$current_cpu"
       output_name = _xctest_output
       output_prefix_override = true
       output_extension = ""
     }
 
-    if (_is_fat_build) {
-      action(_xctest_lipo_loadable_module_target) {
-        visibility = _xctest_lipo_loadable_module_visibility
-        script = "//build/toolchain/mac/linker_driver.py"
-        outputs = [
-          "$target_out_dir/$_xctest_output",
+    action(_xctest_lipo_loadable_module_target) {
+      visibility = _xctest_lipo_loadable_module_visibility
+      script = "//build/toolchain/mac/linker_driver.py"
+      outputs = [
+        "$target_out_dir/$_xctest_output",
+      ]
+      inputs = [
+        "$target_out_dir/$current_cpu/$_xctest_output",
+      ]
+      deps = [
+        ":$_xctest_loadable_module_target",
+      ]
+      foreach(_additional_toolchain, additional_toolchains) {
+        _additional_toolchain_target = "$_target_name($_additional_toolchain)"
+        deps += [ ":$_additional_toolchain_target" ]
+        inputs += [ get_label_info(_additional_toolchain_target,
+                                   "root_out_dir") + "/$_xctest_output" ]
+      }
+      args = [
+               "xcrun",
+               "lipo",
+               "-create",
+               "-output",
+               rebase_path(outputs[0], root_build_dir),
+             ] + rebase_path(inputs, root_build_dir)
+
+      if (enable_dsyms) {
+        _dsyms_dir = "$root_out_dir/$_output_name.dSYM/"
+        outputs += [
+          "$_dsyms_dir/",
+          "$_dsyms_dir/Contents/Info.plist",
+          "$_dsyms_dir/Contents/Resources/DWARF/$_output_name",
         ]
-        inputs = [
-          "$target_out_dir/$current_cpu/$_xctest_output",
-        ]
-        deps = [
-          ":$_xctest_loadable_module_target",
-        ]
-        foreach(_additional_toolchain, additional_toolchains) {
-          _additional_toolchain_target = "$_target_name($_additional_toolchain)"
-          deps += [ ":$_additional_toolchain_target" ]
-          inputs += [ get_label_info(_additional_toolchain_target,
-                                     "root_out_dir") + "/$_xctest_output" ]
-        }
-        args = [
-                 "xcrun",
-                 "lipo",
-                 "-create",
-                 "-output",
-                 rebase_path(outputs[0], root_build_dir),
-               ] + rebase_path(inputs, root_build_dir)
+        args +=
+            [ "-Wcrl,dsym," + rebase_path("$root_out_dir/.", root_build_dir) ]
+      }
 
-        if (enable_dsyms) {
-          _dsyms_dir = "$root_out_dir/$_output_name.dSYM/"
-          outputs += [
-            "$_dsyms_dir/",
-            "$_dsyms_dir/Contents/Info.plist",
-            "$_dsyms_dir/Contents/Resources/DWARF/$_output_name",
-          ]
-          args +=
-              [ "-Wcrl,dsym," + rebase_path("$root_out_dir/.", root_build_dir) ]
-        }
-
-        if (enable_stripping) {
-          # Check whether //build/config/mac:strip_all has been removed from
-          # the configs variable (as this is how stripping is disabled for a
-          # single target).
-          _strip_all_in_config = false
-          if (defined(invoker.configs)) {
-            foreach(_config, invoker.configs) {
-              if (_config == "//build/config/mac:strip_all") {
-                _strip_all_in_config = true
-              }
-            }
-          }
-
-          if (_strip_all_in_config) {
-            args += [ "-Wcrl,strip,-x,-S" ]
-
-            if (save_unstripped_output) {
-              outputs += [ outputs[0] + ".unstripped" ]
-              args += [ "-Wcrl,unstripped," +
-                        rebase_path(get_path_info(outputs[0], "dir"),
-                                    root_build_dir) ]
+      if (enable_stripping) {
+        # Check whether //build/config/mac:strip_all has been removed from
+        # the configs variable (as this is how stripping is disabled for a
+        # single target).
+        _strip_all_in_config = false
+        if (defined(invoker.configs)) {
+          foreach(_config, invoker.configs) {
+            if (_config == "//build/config/mac:strip_all") {
+              _strip_all_in_config = true
             }
           }
         }
+
+        if (_strip_all_in_config) {
+          args += [ "-Wcrl,strip,-x,-S" ]
+
+          if (save_unstripped_output) {
+            outputs += [ outputs[0] + ".unstripped" ]
+            args += [ "-Wcrl,unstripped," +
+                      rebase_path(get_path_info(outputs[0], "dir"),
+                                  root_build_dir) ]
+          }
+        }
       }
     }
 
     _xctest_bundle = _xctest_target + "_bundle"
 
     create_bundle(_xctest_target) {
       visibility = [ ":$_xctest_bundle" ]
       product_type = "com.apple.product-type.bundle.unit-test"
       deps = [
         ":$_xctest_info_plist_bundle",
+        ":$_xctest_lipo_loadable_module_target",
       ]
       bundle_root_dir = "$root_out_dir/$_xctest_output.xctest"
 
-      if (_is_fat_build) {
-        deps += [ ":$_xctest_lipo_loadable_module_target" ]
-      } else {
-        deps += [ ":$_xctest_loadable_module_target" ]
-      }
-
       _entitlements_path = _default_entitlements_path
       if (defined(invoker.entitlements_path)) {
         _entitlements_path = invoker.entitlements_path
       }
 
       code_signing_script = _code_signing_script_path
       code_signing_sources = [
         _entitlements_path,
         "$target_out_dir/$_xctest_output",
       ]
@@ skipping 43 matching lines @@
     }
 
     # Xcode needs those two framework installed in the application (and signed)
     # for the XCTest to run, so install them using extra_system_frameworks.
     _ios_platform_library = "$ios_sdk_platform_path/Developer/Library"
     extra_system_frameworks = [
       "$_ios_platform_library/Frameworks/XCTest.framework",
       "$_ios_platform_library/PrivateFrameworks/IDEBundleInjection.framework",
     ]
 
-    if (!_is_fat_build || _is_fat_build_main_target) {
+    if (!_is_secondary_build) {
       if (!defined(bundle_deps)) {
         bundle_deps = []
       }
       bundle_deps += [ ":$_xctest_bundle" ]
     }
 
     if (!defined(ldflags)) {
       ldflags = []
     }
     ldflags += [
       "-Xlinker",
       "-rpath",
       "-Xlinker",
       "@executable_path/Frameworks",
       "-Xlinker",
       "-rpath",
       "-Xlinker",
       "@loader_path/Frameworks",
     ]
   }
 }
 
 set_defaults("ios_xctest_test") {
   configs = default_executable_configs
 }