Unreviewed, reverting 278232@main.

https://bugs.webkit.org/show_bug.cgi?id=273647 Broke internal builds Reverted changeset: "[visionOS] Add SPI module for LinearMediaKit" https://bugs.webkit.org/show_bug.cgi?id=273527 https://commits.webkit.org/278232@main Canonical link: https://commits.webkit.org/278283@main
WebKit · May 2, 2024 · e93b6c1 · e93b6c1
1 parent bcd2464
commit e93b6c1
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 161 deletions.
diff --git a/Source/WebKit/Configurations/WebKitSwift.xcconfig b/Source/WebKit/Configurations/WebKitSwift.xcconfig
@@ -58,14 +58,7 @@ SWIFT_OBJC_INTEROP_MODE = objcxx;
 SWIFT_VERSION = 5.0;
 
 CLANG_INSTRUMENT_FOR_OPTIMIZATION_PROFILING = NO; // Disable PGO profile generation
-OTHER_LDFLAGS = $(inherited) $(SOURCE_VERSION_LDFLAGS) $(FRAMEWORK_LDFLAGS_$(WK_PLATFORM_NAME));
-
-FRAMEWORK_LDFLAGS_xros = -framework LinearMediaKit;
-FRAMEWORK_LDFLAGS_xrsimulator = -framework LinearMediaKit;
-
-// Use handwritten SPI modules on public SDKs.
-SWIFT_INCLUDE_PATHS = $(SWIFT_INCLUDE_PATHS_$(USE_INTERNAL_SDK));
-SWIFT_INCLUDE_PATHS_ = $(SRCROOT)/Platform/spi/visionos $(inherited);
+OTHER_LDFLAGS = $(inherited) $(SOURCE_VERSION_LDFLAGS);
 
 WEBKITSWIFT_HEADERS_FOLDER_PATH = $(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitSwift;
 

diff --git a/Source/WebKit/Platform/spi/visionos/LinearMediaKit.swiftinterface b/Source/WebKit/Platform/spi/visionos/LinearMediaKit.swiftinterface
diff --git a/Source/WebKit/WebKitSwift/LinearMediaKit/WKSLinearMediaPlayer.h b/Source/WebKit/WebKitSwift/LinearMediaKit/WKSLinearMediaPlayer.h
@@ -28,8 +28,6 @@
 #if defined(TARGET_OS_VISION) && TARGET_OS_VISION
 
 #import <UIKit/UIKit.h>
-#import <wtf/Platform.h>
-#import <wtf/spi/darwin/XPCSPI.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/Source/WebKit/WebKitSwift/WebKitSwift.h b/Source/WebKit/WebKitSwift/WebKitSwift.h
@@ -24,6 +24,7 @@
  */
 
 #import <WebKitSwift/LinearMediaKitExtras.h>
+#import <WebKitSwift/LinearMediaKitSPI.h>
 #import <WebKitSwift/WKSLinearMediaPlayer.h>
 #import <WebKitSwift/WKSLinearMediaTypes.h>
 #import <WebKitSwift/WKSPreviewWindowController.h>