Merge pull request #7112 from dnkoutso/strip_dysm

Strip vendored dSYMs during embed script phase

CHANGELOG.md

@@ -30,6 +30,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 
 ##### Bug Fixes
 
+* Strip vendored dSYMs during embed script phase  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7111](https://github.com/CocoaPods/CocoaPods/issues/7111)
+
 * Warn when a pod that was added or changed includes script phases  
   [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
   [#7110](https://github.com/CocoaPods/CocoaPods/pull/7110)

lib/cocoapods/generator/embed_frameworks_script.rb

@@ -102,6 +102,15 @@ module Pod
               echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" --filter \\"- Headers\\" --filter \\"- PrivateHeaders\\" --filter \\"- Modules\\" \\"${source}\\" \\"${DWARF_DSYM_FOLDER_PATH}\\""
               rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}"
             fi
+
+            local basename
+            basename="$(basename -s .framework.dSYM "$source")"
+            binary="${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}"
+
+            # Strip invalid architectures so "fat" simulator / device frameworks work on device
+            if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then
+              strip_invalid_archs "$binary"
+            fi
           }
 
           # Signs a framework with the provided identity

cocoapods-integration-specs @ 16b191d9

-Subproject commit 70e3f73d93e62c964c0ef96c340d4a35e63907c5
+Subproject commit 16b191d98446d2aad1e8a1ec73d1c5a743bb9f43