GN: Generate appropriate .dSYMs for .frameworks and .apps

build/toolchain/mac/linker_driver.py

 #!/usr/bin/env python
 
 # Copyright 2016 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 os
 import os.path
 import shutil
 import subprocess
 import sys
 
 # The linker_driver.py is responsible for forwarding a linker invocation to
 # the compiler driver, while processing special arguments itself.
 #
 # Usage: linker_driver.py clang++ main.o -L. -llib -o prog -Wcrl,dsym,out
 #
 # On Mac, the logical step of linking is handled by three discrete tools to
 # perform the image link, debug info link, and strip. The linker_driver.py
 # combines these three steps into a single tool.
 #
 # The command passed to the linker_driver.py should be the compiler driver
 # invocation for the linker. It is first invoked unaltered (except for the
 # removal of the special driver arguments, described below). Then the driver
 # performs additional actions, based on these arguments:
 #
-#   -Wcrl,dsym,<dsym_path_prefix>
+#   -Wcrl,dsym,<dsym_path_prefix>,<dsym_file_name>
 #       After invoking the linker, this will run `dsymutil` on the linker's
 #       output, producing a dSYM bundle, stored at dsym_path_prefix. As an
 #       example, if the linker driver were invoked with:
-#         "... -o out/gn/obj/foo/libbar.dylib ... -Wcrl,dsym,out/gn ..."
-#       The resulting dSYM would be out/gn/libbar.dylib.dSYM/.
+#         "... -o out/gn/obj/foo/libbar.dylib ... -Wcrl,dsym,out/gn,
+#          libbar.framework.dSYM ..."
+#       The resulting dSYM would be out/gn/libbar.framework.dSYM/.
 #
 #   -Wcrl,unstripped,<unstripped_path_prefix>
 #       After invoking the linker, and before strip, this will save a copy of
 #       the unstripped linker output in the directory unstripped_path_prefix.
 #
 #   -Wcrl,strip,<strip_arguments>
 #       After invoking the linker, and optionally dsymutil, this will run
 #       the strip command on the linker's output. strip_arguments are
 #       comma-separated arguments to be passed to the strip command.
 
@@ skipping 71 matching lines @@
 
   for driver_action in _LINKER_DRIVER_ACTIONS:
     (name, action) = driver_action
     if sub_arg.startswith(name):
       return (name,
           lambda full_args: action(sub_arg[len(name):], full_args))
 
   raise ValueError('Unknown linker driver argument: %s' % (arg,))
 
 
-def RunDsymUtil(dsym_path_prefix, full_args):
-  """Linker driver action for -Wcrl,dsym,<dsym-path-prefix>. Invokes dsymutil
-  on the linker's output and produces a dsym file at |dsym_file| path.
+def RunDsymUtil(dsym_args_string, full_args):
+  """Linker driver action for -Wcrl,dsym,<dsym-path-prefix>,<dsym-file-name>.
+  Invokes dsymutil on the linker's output and produces a dsym file at
+  |dsym_path_prefix| path with |dsym_file_name| name.
 
   Args:
+    dsym_args_string: string, consists of comma-separated dsym_path_prefix and
+      dsym_file_name.
+    full_args: list of string, Full argument list for the linker driver.
+
     dsym_path_prefix: string, The path at which the dsymutil output should be
-        located.
-    full_args: list of string, Full argument list for the linker driver.
+         located.
+    dsym_file_name: string, The resulting file name of the .dSYM bundle.
 
   Returns:
       list of string, Build step outputs.
   """
+  (dsym_path_prefix, dsym_file_name) = dsym_args_string.split(',')
   if not len(dsym_path_prefix):
     raise ValueError('Unspecified dSYM output file')
 
   linker_out = _FindLinkerOutput(full_args)
-  base = os.path.basename(linker_out)
-  dsym_out = os.path.join(dsym_path_prefix, base + '.dSYM')
+  dsym_out = os.path.join(dsym_path_prefix, dsym_file_name)
 
   # Remove old dSYMs before invoking dsymutil.
   _RemovePath(dsym_out)
   subprocess.check_call(['xcrun', 'dsymutil', '-o', dsym_out, linker_out])
   return [dsym_out]
 
 
 def RunSaveUnstripped(unstripped_path_prefix, full_args):
   """Linker driver action for -Wcrl,unstripped,<unstripped_path_prefix>. Copies
   the linker output to |unstripped_path_prefix| before stripping.
@@ skipping 69 matching lines @@
 _LINKER_DRIVER_ACTIONS = [
     ('dsym,', RunDsymUtil),
     ('unstripped,', RunSaveUnstripped),
     ('strip,', RunStrip),
 ]
 
 
 if __name__ == '__main__':
   Main(sys.argv)
   sys.exit(0)