Revert of Do not produce dSYM file for the iOS Frameworks with bitcode

tools-webrtc/ios/build_ios_libs.py

 #!/usr/bin/env python
 
 # Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
@@ skipping 92 matching lines @@
 
   gn_args.append('enable_ios_bitcode=' +
                  ('true' if use_bitcode else 'false'))
   gn_args.append('use_goma=' + ('true' if use_goma else 'false'))
 
   # Generate static or dynamic.
   if build_type == 'static_only':
     gn_target_name = 'rtc_sdk_objc'
   elif build_type == 'framework':
     gn_target_name = 'rtc_sdk_framework_objc'
-    if not use_bitcode:
-      gn_args.append('enable_dsyms=true')
+    gn_args.append('enable_dsyms=true')
     gn_args.append('enable_stripping=true')
   else:
     raise ValueError('Build type "%s" is not supported.' % build_type)
 
   args_string = ' '.join(gn_args + extra_gn_args)
   logging.info('Building WebRTC with args: %s', args_string)
 
   cmd = ['gn', 'gen', output_dir, '--args=' + args_string]
   _RunCommand(cmd)
   logging.info('Building target: %s', gn_target_name)
@@ skipping 46 matching lines @@
     lib_paths = [os.path.join(args.output_dir, arch + '_libs')
                  for arch in architectures]
 
     # Combine the slices.
     dylib_path = os.path.join(SDK_FRAMEWORK_NAME, 'WebRTC')
     # Dylibs will be combined, all other files are the same across archs.
     # Use distutils instead of shutil to support merging folders.
     distutils.dir_util.copy_tree(
         os.path.join(lib_paths[0], SDK_FRAMEWORK_NAME),
         os.path.join(args.output_dir, SDK_FRAMEWORK_NAME))
+    try:
+      os.remove(os.path.join(args.output_dir, dylib_path))
+    except OSError:
+      pass
     logging.info('Merging framework slices.')
     dylib_paths = [os.path.join(path, dylib_path) for path in lib_paths]
     out_dylib_path = os.path.join(args.output_dir, dylib_path)
-    try:
-      os.remove(out_dylib_path)
-    except OSError:
-      pass
     cmd = ['lipo'] + dylib_paths + ['-create', '-output', out_dylib_path]
     _RunCommand(cmd)
 
     # Merge the dSYM slices.
-    lib_dsym_dir_path = os.path.join(lib_paths[0], 'WebRTC.dSYM')
-    if os.path.isdir(lib_dsym_dir_path):
-      distutils.dir_util.copy_tree(lib_dsym_dir_path,
-                                   os.path.join(args.output_dir, 'WebRTC.dSYM'))
-      logging.info('Merging dSYM slices.')
-      dsym_path = os.path.join('WebRTC.dSYM', 'Contents', 'Resources', 'DWARF',
-                               'WebRTC')
-      lib_dsym_paths = [os.path.join(path, dsym_path) for path in lib_paths]
-      out_dsym_path = os.path.join(args.output_dir, dsym_path)
-      try:
-        os.remove(out_dsym_path)
-      except OSError:
-        pass
-      cmd = ['lipo'] + lib_dsym_paths + ['-create', '-output', out_dsym_path]
-      _RunCommand(cmd)
+    dsym_path = os.path.join('WebRTC.dSYM', 'Contents', 'Resources', 'DWARF',
+                             'WebRTC')
+    distutils.dir_util.copy_tree(os.path.join(lib_paths[0], 'WebRTC.dSYM'),
+                                 os.path.join(args.output_dir, 'WebRTC.dSYM'))
+    try:
+      os.remove(os.path.join(args.output_dir, dsym_path))
+    except OSError:
+      pass
+    logging.info('Merging dSYM slices.')
+    dsym_paths = [os.path.join(path, dsym_path) for path in lib_paths]
+    out_dsym_path = os.path.join(args.output_dir, dsym_path)
+    cmd = ['lipo'] + dsym_paths + ['-create', '-output', out_dsym_path]
+    _RunCommand(cmd)
 
     # Modify the version number.
     # Format should be <Branch cut MXX>.<Hotfix #>.<Rev #>.
     # e.g. 55.0.14986 means branch cut 55, no hotfixes, and revision 14986.
     infoplist_path = os.path.join(args.output_dir, SDK_FRAMEWORK_NAME,
                                   'Info.plist')
     cmd = ['PlistBuddy', '-c',
            'Print :CFBundleShortVersionString', infoplist_path]
     major_minor = subprocess.check_output(cmd).strip()
     version_number = '%s.%s' % (major_minor, args.revision)
     logging.info('Substituting revision number: %s', version_number)
     cmd = ['PlistBuddy', '-c',
            'Set :CFBundleVersion ' + version_number, infoplist_path]
     _RunCommand(cmd)
     _RunCommand(['plutil', '-convert', 'binary1', infoplist_path])
 
   logging.info('Done.')
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())