Revert "Switch overlays from using @exported to -import-underlying-module."

jrose-apple · jrose-apple · commit 99768eb3466b · 2015-06-17T05:02:21.000Z
This reverts r29441 because it breaks the Linux build. I'll talk to Dmitri
about this tomorrow.

See rdar://problem/21254367

Swift SVN r29444
diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake
@@ -298,9 +298,7 @@ function(_compile_swift_files dependency_target_out_var_name)
   endif()
 
   if(SWIFTFILE_IS_SDK_OVERLAY)
-    list(APPEND swift_flags
-         "-autolink-force-load"
-         "-import-underlying-module")
+    list(APPEND swift_flags "-autolink-force-load")
   endif()
 
   list(APPEND swift_flags ${SWIFT_EXPERIMENTAL_EXTRA_FLAGS})
diff --git a/stdlib/public/SDK/AVFoundation/AVFoundation.swift b/stdlib/public/SDK/AVFoundation/AVFoundation.swift
@@ -1,3 +1,4 @@
+@exported import AVFoundation // Clang module
 import Foundation
 
 extension AVError : _BridgedNSError {
diff --git a/stdlib/public/SDK/AppKit/AppKit.swift b/stdlib/public/SDK/AppKit/AppKit.swift
@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
+@exported import AppKit
 
 class REPLApplication : NSApplication {
 }
diff --git a/stdlib/public/SDK/AssetsLibrary/AssetsLibrary.swift b/stdlib/public/SDK/AssetsLibrary/AssetsLibrary.swift
@@ -10,6 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+@exported import AssetsLibrary // Clang module
+
 //===----------------------------------------------------------------------===//
 // ALAssetsLibrary.h
 //===----------------------------------------------------------------------===//
diff --git a/stdlib/public/SDK/CloudKit/CloudKit.swift b/stdlib/public/SDK/CloudKit/CloudKit.swift
@@ -1,3 +1,4 @@
+@exported import CloudKit
 import Foundation
 
 @available(OSX, introduced=10.10) @available(iOS, introduced=8.0)
diff --git a/stdlib/public/SDK/CoreAudio/CoreAudio.swift b/stdlib/public/SDK/CoreAudio/CoreAudio.swift
@@ -10,6 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+@exported import CoreAudio // Clang module
+
 extension UnsafeBufferPointer {
   /// Initialize an `UnsafeBufferPointer<T>` from an `AudioBuffer`.
   public init(_ audioBuffer: AudioBuffer) {
diff --git a/stdlib/public/SDK/CoreBluetooth/CoreBluetooth.swift b/stdlib/public/SDK/CoreBluetooth/CoreBluetooth.swift
@@ -1,3 +1,4 @@
+@exported import CoreBluetooth
 import Foundation
 
 extension CBError : _BridgedNSError {
diff --git a/stdlib/public/SDK/CoreData/CoreData.swift b/stdlib/public/SDK/CoreData/CoreData.swift
@@ -1,3 +1,4 @@
+@exported import CoreData
 import Foundation
 
 public extension NSCocoaError {
diff --git a/stdlib/public/SDK/CoreGraphics/CGFloat.swift.gyb b/stdlib/public/SDK/CoreGraphics/CGFloat.swift.gyb
@@ -19,6 +19,7 @@ word_bits = int(CMAKE_SIZEOF_VOID_P) * 8
 
 }%
 
+@exported import CoreGraphics
 import Darwin
 
 public struct CGFloat {
diff --git a/stdlib/public/SDK/CoreGraphics/CoreGraphics.swift b/stdlib/public/SDK/CoreGraphics/CoreGraphics.swift
@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+@exported import CoreGraphics
 import Darwin
 
 //===----------------------------------------------------------------------===//
diff --git a/stdlib/public/SDK/CoreImage/CoreImage.swift b/stdlib/public/SDK/CoreImage/CoreImage.swift
@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
+@exported import CoreImage  // Clang module
 
 #if os(OSX)
 import QuartzCore
diff --git a/stdlib/public/SDK/CoreLocation/CoreLocation.swift b/stdlib/public/SDK/CoreLocation/CoreLocation.swift
@@ -1,3 +1,4 @@
+@exported import CoreLocation
 import Foundation
 
 extension CLError : _BridgedNSError {
diff --git a/stdlib/public/SDK/CoreMedia/CMTime.swift b/stdlib/public/SDK/CoreMedia/CMTime.swift
@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+@exported import CoreMedia // Clang module
 
 // CMTIME_IS_VALID
 // CMTIME_IS_INVALID
diff --git a/stdlib/public/SDK/CoreMedia/CMTimeRange.swift b/stdlib/public/SDK/CoreMedia/CMTimeRange.swift
@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+@exported import CoreMedia // Clang module
 
 // CMTIMERANGE_IS_VALID
 // CMTIMERANGE_IS_INVALID
diff --git a/stdlib/public/SDK/CoreMedia/CoreMedia.swift b/stdlib/public/SDK/CoreMedia/CoreMedia.swift
@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+@exported import CoreMedia // Clang module
 
 // Nothing here yet.
 
diff --git a/stdlib/public/SDK/Darwin/Darwin.swift b/stdlib/public/SDK/Darwin/Darwin.swift
@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+@exported import Darwin // Clang module
 
 
 //===----------------------------------------------------------------------===//
diff --git a/stdlib/public/SDK/Dispatch/Dispatch.swift b/stdlib/public/SDK/Dispatch/Dispatch.swift
@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+@exported import Dispatch
 
 //===----------------------------------------------------------------------===//
 // Macros
diff --git a/stdlib/public/SDK/EventKit/EventKit.swift b/stdlib/public/SDK/EventKit/EventKit.swift
@@ -1,3 +1,4 @@
+@exported import EventKit
 import Foundation
 
 extension EKErrorCode : _BridgedNSError {
diff --git a/stdlib/public/SDK/Foundation/Foundation.swift b/stdlib/public/SDK/Foundation/Foundation.swift
@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+@exported import Foundation // Clang module
 import CoreFoundation
 import CoreGraphics
 
diff --git a/stdlib/public/SDK/GLKit/GLKit.swift.gyb b/stdlib/public/SDK/GLKit/GLKit.swift.gyb
@@ -12,6 +12,7 @@
 // GLKit overlays for Swift
 //===----------------------------------------------------------------------===//
 
+@exported import GLKit // Clang module
 
 // The GLKit headers provide a fairly complete set of types and operations
 // that Swift's importer is now able to present in Swift. However, Swift
diff --git a/stdlib/public/SDK/GameKit/GameKit.swift b/stdlib/public/SDK/GameKit/GameKit.swift
@@ -1,3 +1,4 @@
+@exported import GameKit
 import Foundation
 
 extension GKErrorCode : _BridgedNSError {
diff --git a/stdlib/public/SDK/GameplayKit/GameplayKit.swift b/stdlib/public/SDK/GameplayKit/GameplayKit.swift
@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+@exported import GameplayKit
 
 @asmname("GK_Swift_GKEntity_componentForClass")
 internal func GK_Swift_GKEntity_componentForClass(
diff --git a/stdlib/public/SDK/HomeKit/HomeKit.swift b/stdlib/public/SDK/HomeKit/HomeKit.swift
@@ -1,3 +1,4 @@
+@exported import HomeKit
 import Foundation
 
 @available(iOS 8.0, *)
diff --git a/stdlib/public/SDK/LocalAuthentication/LocalAuthentication.swift b/stdlib/public/SDK/LocalAuthentication/LocalAuthentication.swift
@@ -1,3 +1,4 @@
+@exported import LocalAuthentication
 import Foundation
 
 @available(OSX, introduced=10.10) @available(iOS, introduced=8.0)
diff --git a/stdlib/public/SDK/MultipeerConnectivity/MultipeerConnectivity.swift b/stdlib/public/SDK/MultipeerConnectivity/MultipeerConnectivity.swift
@@ -1,3 +1,4 @@
+@exported import MultipeerConnectivity
 import Foundation
 
 @available(OSX, introduced=10.10) @available(iOS, introduced=7.0)
diff --git a/stdlib/public/SDK/OpenCL/OpenCL.swift b/stdlib/public/SDK/OpenCL/OpenCL.swift
@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+@exported import OpenCL // Clang module
 
 @available(OSX, introduced=10.7)
 public func clSetKernelArgsListAPPLE(
diff --git a/stdlib/public/SDK/PassKit/PassKit.swift b/stdlib/public/SDK/PassKit/PassKit.swift
@@ -1,3 +1,4 @@
+@exported import PassKit
 import Foundation
 
 @available(iOS, introduced=6.0)
diff --git a/stdlib/public/SDK/SceneKit/SceneKit.swift b/stdlib/public/SDK/SceneKit/SceneKit.swift
@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+@exported import SceneKit // Clang module
 
 @available(iOS, introduced=8.0)
 @available(OSX, introduced=10.8)
diff --git a/stdlib/public/SDK/Security/Security.swift b/stdlib/public/SDK/Security/Security.swift
@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+@exported import Security // Clang module
 
 //===----------------------------------------------------------------------===//
 // SecBase.h
diff --git a/stdlib/public/SDK/SpriteKit/SpriteKit.swift b/stdlib/public/SDK/SpriteKit/SpriteKit.swift
@@ -1,3 +1,4 @@
+@exported import SpriteKit
 
 // SpriteKit defines SKColor using a macro.
 
diff --git a/stdlib/public/SDK/UIKit/UIKit.swift b/stdlib/public/SDK/UIKit/UIKit.swift
@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
+@exported import UIKit
 
 // These are un-imported macros in UIKit.
 
diff --git a/stdlib/public/SDK/WatchConnectivity/WatchConnectivity.swift b/stdlib/public/SDK/WatchConnectivity/WatchConnectivity.swift
@@ -1,3 +1,4 @@
+@exported import WatchConnectivity
 import Foundation
 
 @available(iOS, introduced=9.0)
diff --git a/stdlib/public/SDK/WatchKit/WatchKit.swift b/stdlib/public/SDK/WatchKit/WatchKit.swift
@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+@exported import WatchKit
 import Foundation
 
 @available(iOS 8.2, *)
diff --git a/stdlib/public/SDK/WebKit/WebKit.swift b/stdlib/public/SDK/WebKit/WebKit.swift
@@ -1,3 +1,4 @@
+@exported import WebKit
 import Foundation
 
 @available(OSX, introduced=10.10) @available(iOS, introduced=8.0)
diff --git a/stdlib/public/SDK/XCTest/XCTest.swift b/stdlib/public/SDK/XCTest/XCTest.swift
@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+@exported import XCTest // Clang module
 
 import CoreGraphics
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+@exported import AVFoundation // Clang module`
`1`	`2`	`import Foundation`
`2`	`3`
`3`	`4`	`extension AVError : _BridgedNSError {`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`//===----------------------------------------------------------------------===//`
`12`	`12`
`13`	`13`	`import Foundation`
	`14`	`+@exported import AppKit`
`14`	`15`
`15`	`16`	`class REPLApplication : NSApplication {`
`16`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+@exported import CloudKit`
`1`	`2`	`import Foundation`
`2`	`3`
`3`	`4`	`@available(OSX, introduced=10.10) @available(iOS, introduced=8.0)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+@exported import CoreBluetooth`
`1`	`2`	`import Foundation`
`2`	`3`
`3`	`4`	`extension CBError : _BridgedNSError {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+@exported import CoreData`
`1`	`2`	`import Foundation`
`2`	`3`
`3`	`4`	`public extension NSCocoaError {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+@exported import CoreLocation`
`1`	`2`	`import Foundation`
`2`	`3`
`3`	`4`	`extension CLError : _BridgedNSError {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+@exported import EventKit`
`1`	`2`	`import Foundation`
`2`	`3`
`3`	`4`	`extension EKErrorCode : _BridgedNSError {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+@exported import GameKit`
`1`	`2`	`import Foundation`
`2`	`3`
`3`	`4`	`extension GKErrorCode : _BridgedNSError {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+@exported import HomeKit`
`1`	`2`	`import Foundation`
`2`	`3`
`3`	`4`	`@available(iOS 8.0, *)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+@exported import LocalAuthentication`
`1`	`2`	`import Foundation`
`2`	`3`
`3`	`4`	`@available(OSX, introduced=10.10) @available(iOS, introduced=8.0)`