[iOS/GN] Fix generation of .dSYM for fat binary builds.

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")
 
 # 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
 #         the bundle.
 #
 #     info_plist_target:
@@ skipping 255 matching lines @@
       # 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/config/mac/xcrun.py"
+        script = "//build/toolchain/mac/linker_driver.py"
         outputs = [
           _executable_path,
         ]
         inputs = [
           _arch_executable_path,
         ]
         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) {
+          outputs += [ "$root_out_dir/$_output_name.dSYM/" ]
+          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 (!ios_enable_code_signing) {
       # If codesigning is enabled, the binary will be copied into the bundle
       # by the codesigning script (as the binary is updated by the signature).
       # Otherwise, this "bundle_data" declares the location of the binary in
       # the .app bundle.
       bundle_data(_bundle_data_executable) {
         forward_variables_from(invoker, [ "testonly" ])
@@ skipping 501 matching lines @@
       public_deps = [
         ":$_framework_target+link$_toolchain_suffix",
       ]
     }
   }
 }
 
 set_defaults("ios_framework_bundle") {
   configs = default_shared_library_configs
 }