Title: [275903] branches/safari-612.1.11-branch/Source/WebKit
- Revision
- 275903
- Author
- rubent...@apple.com
- Date
- 2021-04-13 13:06:48 -0700 (Tue, 13 Apr 2021)
Log Message
Cherry-pick r275898. rdar://problem/76520529
[Cocoa] remove link-time dependency on WebKitSwift
https://bugs.webkit.org/show_bug.cgi?id=224493
Reviewed by Eric Carlson.
* Configurations/WebKit.xcconfig:
* WebKit.xcodeproj/project.pbxproj:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275898 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.11-branch/Source/WebKit/ChangeLog (275902 => 275903)
--- branches/safari-612.1.11-branch/Source/WebKit/ChangeLog 2021-04-13 19:56:56 UTC (rev 275902)
+++ branches/safari-612.1.11-branch/Source/WebKit/ChangeLog 2021-04-13 20:06:48 UTC (rev 275903)
@@ -1,3 +1,28 @@
+2021-04-13 Ruben Turcios <rubent...@apple.com>
+
+ Cherry-pick r275898. rdar://problem/76520529
+
+ [Cocoa] remove link-time dependency on WebKitSwift
+ https://bugs.webkit.org/show_bug.cgi?id=224493
+
+ Reviewed by Eric Carlson.
+
+ * Configurations/WebKit.xcconfig:
+ * WebKit.xcodeproj/project.pbxproj:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275898 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-04-13 Jer Noble <jer.no...@apple.com>
+
+ [Cocoa] remove link-time dependency on WebKitSwift
+ https://bugs.webkit.org/show_bug.cgi?id=224493
+
+ Reviewed by Eric Carlson.
+
+ * Configurations/WebKit.xcconfig:
+ * WebKit.xcodeproj/project.pbxproj:
+
2021-04-11 Sam Weinig <wei...@apple.com>
Simplify WebKitTestRunner preference reset to be more like DRT
Modified: branches/safari-612.1.11-branch/Source/WebKit/Configurations/WebKit.xcconfig (275902 => 275903)
--- branches/safari-612.1.11-branch/Source/WebKit/Configurations/WebKit.xcconfig 2021-04-13 19:56:56 UTC (rev 275902)
+++ branches/safari-612.1.11-branch/Source/WebKit/Configurations/WebKit.xcconfig 2021-04-13 20:06:48 UTC (rev 275903)
@@ -201,8 +201,5 @@
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_COORDINATOR_LDFLAGS = $(WK_COORDINATOR_LDFLAGS_$(WK_HAVE_COORDINATOR))
-WK_COORDINATOR_LDFLAGS_YES = -weak-lWebKitSwift
-
EXCLUDED_SOURCE_FILE_NAMES = $(WK_EXCLUDED_COORDINATOR_FILES) $(EXCLUDED_IOS_RESOURCE_FILE_NAMES) $(EXCLUDED_MACOS_PLUGIN_FILE_NAMES)
SWIFT_INSTALL_OBJC_HEADER = NO
Modified: branches/safari-612.1.11-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj (275902 => 275903)
--- branches/safari-612.1.11-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-04-13 19:56:56 UTC (rev 275902)
+++ branches/safari-612.1.11-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-04-13 20:06:48 UTC (rev 275903)
@@ -2197,13 +2197,6 @@
remoteGlobalIDString = BC3DE46515A91763008D26FC;
remoteInfo = WebKit2Service;
};
- CD954940261590B4008372D9 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = CD95493426159004008372D9;
- remoteInfo = WebKitSwift;
- };
E1AC2E2D20F7B98800B0897D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
@@ -13105,7 +13098,6 @@
535E08C422545B7200DF00CA /* PBXBuildRule */,
);
dependencies = (
- CD954941261590B4008372D9 /* PBXTargetDependency */,
E1AC2E3E20F7B9C000B0897D /* PBXTargetDependency */,
37F7407912721F740093869B /* PBXTargetDependency */,
2D11BA052126A5AE006F8878 /* PBXTargetDependency */,
@@ -14595,11 +14587,6 @@
target = BC3DE46515A91763008D26FC /* WebContent */;
targetProxy = BCA8D46715BCE0D6009DC1F1 /* PBXContainerItemProxy */;
};
- CD954941261590B4008372D9 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = CD95493426159004008372D9 /* WebKitSwift */;
- targetProxy = CD954940261590B4008372D9 /* PBXContainerItemProxy */;
- };
E1AC2E2E20F7B98800B0897D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = E1AC2E2720F7B94C00B0897D /* Unlock Keychain */;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
