Title: [288144] trunk/Source/WebKit
- Revision
- 288144
- Author
- commit-qu...@webkit.org
- Date
- 2022-01-18 13:11:45 -0800 (Tue, 18 Jan 2022)
Log Message
Don't build WKGroupSession.swift when using Monterey public SDK
https://bugs.webkit.org/show_bug.cgi?id=235324
Patch by Alex Christensen <achristen...@webkit.org> on 2022-01-18
Reviewed by Jer Noble.
* Configurations/WebKit.xcconfig:
Remove unused exclusion of WKGroupSession.swift which is only built in WebKitSwift.
* Configurations/WebKitSwift.xcconfig:
Remove unused reference to WKCoordinator.mm and WKCoordinator.h which don't exist any more.
Don't build WKGroupSession.swift with the public SDK since it uses "@_spi(Safari)"
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (288143 => 288144)
--- trunk/Source/WebKit/ChangeLog 2022-01-18 21:03:15 UTC (rev 288143)
+++ trunk/Source/WebKit/ChangeLog 2022-01-18 21:11:45 UTC (rev 288144)
@@ -1,3 +1,16 @@
+2022-01-18 Alex Christensen <achristen...@webkit.org>
+
+ Don't build WKGroupSession.swift when using Monterey public SDK
+ https://bugs.webkit.org/show_bug.cgi?id=235324
+
+ Reviewed by Jer Noble.
+
+ * Configurations/WebKit.xcconfig:
+ Remove unused exclusion of WKGroupSession.swift which is only built in WebKitSwift.
+ * Configurations/WebKitSwift.xcconfig:
+ Remove unused reference to WKCoordinator.mm and WKCoordinator.h which don't exist any more.
+ Don't build WKGroupSession.swift with the public SDK since it uses "@_spi(Safari)"
+
2022-01-18 Sam Weinig <wei...@apple.com>
Canvas functions that take colors as strings don't support all the syntax that CSS supports
Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (288143 => 288144)
--- trunk/Source/WebKit/Configurations/WebKit.xcconfig 2022-01-18 21:03:15 UTC (rev 288143)
+++ trunk/Source/WebKit/Configurations/WebKit.xcconfig 2022-01-18 21:11:45 UTC (rev 288144)
@@ -206,12 +206,5 @@
WK_HAVE_URL_FORMATTING_macosx = $(WK_HAVE_URL_FORMATTING$(WK_MACOS_1014));
WK_HAVE_URL_FORMATTING_MACOS_SINCE_1014 = YES;
-WK_HAVE_COORDINATOR = $(WK_HAVE_COORDINATOR_$(WK_PLATFORM_NAME));
-WK_HAVE_COORDINATOR_macosx = $(WK_HAVE_COORDINATOR$(WK_MACOS_1200));
-WK_HAVE_COORDINATOR_MACOS_SINCE_1200 = YES;
-
-WK_EXCLUDED_COORDINATOR_FILES = $(WK_EXCLUDED_COORDINATOR_FILES_$(WK_NOT_$(WK_HAVE_COORDINATOR)));
-WK_EXCLUDED_COORDINATOR_FILES_YES = WKCoordinator.h WKCoordinator.mm WKGroupSession.swift
-
-EXCLUDED_SOURCE_FILE_NAMES = libWebKitAdditions.a $(WK_EXCLUDED_COORDINATOR_FILES) $(EXCLUDED_IOS_RESOURCE_FILE_NAMES) $(EXCLUDED_MACOS_PLUGIN_FILE_NAMES)
+EXCLUDED_SOURCE_FILE_NAMES = libWebKitAdditions.a $(EXCLUDED_IOS_RESOURCE_FILE_NAMES) $(EXCLUDED_MACOS_PLUGIN_FILE_NAMES)
SWIFT_INSTALL_OBJC_HEADER = NO
Modified: trunk/Source/WebKit/Configurations/WebKitSwift.xcconfig (288143 => 288144)
--- trunk/Source/WebKit/Configurations/WebKitSwift.xcconfig 2022-01-18 21:03:15 UTC (rev 288143)
+++ trunk/Source/WebKit/Configurations/WebKitSwift.xcconfig 2022-01-18 21:11:45 UTC (rev 288144)
@@ -34,8 +34,10 @@
WK_HAVE_COORDINATOR_macosx = $(WK_HAVE_COORDINATOR$(WK_MACOS_1200));
WK_HAVE_COORDINATOR_MACOS_SINCE_1200 = YES;
-WK_EXCLUDED_COORDINATOR_FILES = $(WK_EXCLUDED_COORDINATOR_FILES_$(WK_NOT_$(WK_HAVE_COORDINATOR)));
-WK_EXCLUDED_COORDINATOR_FILES_YES = WKCoordinator.h WKCoordinator.mm WKGroupSession.swift
+WK_EXCLUDED_COORDINATOR_FILES = $(WK_EXCLUDED_COORDINATOR_FILES_$(USE_INTERNAL_SDK))
+WK_EXCLUDED_COORDINATOR_FILES_ = WKGroupSession.swift
+WK_EXCLUDED_COORDINATOR_FILES_YES = $(WK_EXCLUDED_COORDINATOR_FILES_YES_$(WK_NOT_$(WK_HAVE_COORDINATOR)));
+WK_EXCLUDED_COORDINATOR_FILES_YES_YES = WKGroupSession.swift
EXCLUDED_SOURCE_FILE_NAMES = $(WK_EXCLUDED_COORDINATOR_FILES) $(EXCLUDED_IOS_RESOURCE_FILE_NAMES) $(EXCLUDED_MACOS_PLUGIN_FILE_NAMES)
SWIFT_INSTALL_OBJC_HEADER = NO
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
