Include transitive deps in module maps (#4895)

paulb777 · web-flow · commit eb69dcc01759 · 2020-02-13T07:47:04.000-08:00
diff --git a/FirebaseCore/CHANGELOG.md b/FirebaseCore/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Unreleased
+- [fixed] Fix Zip Builder module map generation that could cause linker missing
+  symbol errors in the 6.14.0 through 6.16.0 binary release distributions. (#4819)
+
 # v6.6.1 -- M63
 - [changed] Minimum required Xcode version changed to 10.3 (was 10.1).
 
diff --git a/ZipBuilder/Sources/ZipBuilder/ModuleMapBuilder.swift b/ZipBuilder/Sources/ZipBuilder/ModuleMapBuilder.swift
@@ -172,11 +172,9 @@ struct ModuleMapBuilder {
           podLibraryDeps = dependencyPod.transitiveLibraries
         }
         if let fdeps = podFrameworkDeps {
-          myFrameworkDeps.subtract(fdeps)
           transitiveFrameworkDeps.formUnion(fdeps)
         }
         if let ldeps = podLibraryDeps {
-          myLibraryDeps.subtract(ldeps)
           transitiveLibraryDeps.formUnion(ldeps)
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -172,11 +172,9 @@ struct ModuleMapBuilder {`
`172`	`172`	`podLibraryDeps = dependencyPod.transitiveLibraries`
`173`	`173`	`}`
`174`	`174`	`if let fdeps = podFrameworkDeps {`
`175`		`- myFrameworkDeps.subtract(fdeps)`
`176`	`175`	`transitiveFrameworkDeps.formUnion(fdeps)`
`177`	`176`	`}`
`178`	`177`	`if let ldeps = podLibraryDeps {`
`179`		`- myLibraryDeps.subtract(ldeps)`
`180`	`178`	`transitiveLibraryDeps.formUnion(ldeps)`
`181`	`179`	`}`
`182`	`180`	`}`