embed fixes

lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb

@@ -109,17 +109,14 @@ module Pod
 
           swift_version = Gem::Version.new(target_swift_version)
           should_embed = !target.requires_host_target? && pod_targets.any?(&:uses_swift?)
-          embed_value = should_embed ? 'YES' : 'NO'
-
-          config = {
-            'ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES' => embed_value,
-            'EMBEDDED_CONTENT_CONTAINS_SWIFT' => embed_value,
-          }
-
-          if swift_version >= EMBED_STANDARD_LIBRARIES_MINIMUM_VERSION || !should_embed
-            config.delete('EMBEDDED_CONTENT_CONTAINS_SWIFT')
+          config = {}
+          if should_embed
+            if swift_version >= EMBED_STANDARD_LIBRARIES_MINIMUM_VERSION
+              config['ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES'] = 'YES'
+            else
+              config['EMBEDDED_CONTENT_CONTAINS_SWIFT'] = 'YES'
+            end
           end
-
           config
         end