Title: [284571] branches/safari-613.1.6-branch/Source/WebKit
- Revision
- 284571
- Author
- [email protected]
- Date
- 2021-10-20 14:39:45 -0700 (Wed, 20 Oct 2021)
Log Message
Cherry-pick r284570. rdar://problem/84479714
Remove com.apple.webkit.adattributiond.plist from build temporarily
https://bugs.webkit.org/show_bug.cgi?id=232045
Reviewed by Tim Horton.
There are some problems with the internal verifiers that will take some time to resolve.
Until they are resolved, don't install the plist and don't tell the network process to connect to the daemon registered by the plist.
* UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp:
(WebKit::WebsiteDataStoreConfiguration::WebsiteDataStoreConfiguration):
* WebKit.xcodeproj/project.pbxproj:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284570 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613.1.6-branch/Source/WebKit/ChangeLog (284570 => 284571)
--- branches/safari-613.1.6-branch/Source/WebKit/ChangeLog 2021-10-20 21:35:45 UTC (rev 284570)
+++ branches/safari-613.1.6-branch/Source/WebKit/ChangeLog 2021-10-20 21:39:45 UTC (rev 284571)
@@ -1,5 +1,39 @@
2021-10-20 Alan Coon <[email protected]>
+ Cherry-pick r284570. rdar://problem/84479714
+
+ Remove com.apple.webkit.adattributiond.plist from build temporarily
+ https://bugs.webkit.org/show_bug.cgi?id=232045
+
+ Reviewed by Tim Horton.
+
+ There are some problems with the internal verifiers that will take some time to resolve.
+ Until they are resolved, don't install the plist and don't tell the network process to connect to the daemon registered by the plist.
+
+ * UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp:
+ (WebKit::WebsiteDataStoreConfiguration::WebsiteDataStoreConfiguration):
+ * WebKit.xcodeproj/project.pbxproj:
+
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284570 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-10-20 Alex Christensen <[email protected]>
+
+ Remove com.apple.webkit.adattributiond.plist from build temporarily
+ https://bugs.webkit.org/show_bug.cgi?id=232045
+
+ Reviewed by Tim Horton.
+
+ There are some problems with the internal verifiers that will take some time to resolve.
+ Until they are resolved, don't install the plist and don't tell the network process to connect to the daemon registered by the plist.
+
+ * UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp:
+ (WebKit::WebsiteDataStoreConfiguration::WebsiteDataStoreConfiguration):
+ * WebKit.xcodeproj/project.pbxproj:
+
+2021-10-20 Alan Coon <[email protected]>
+
Revert r284079. rdar://problem/84478842
2021-10-19 Alan Coon <[email protected]>
Modified: branches/safari-613.1.6-branch/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp (284570 => 284571)
--- branches/safari-613.1.6-branch/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp 2021-10-20 21:35:45 UTC (rev 284570)
+++ branches/safari-613.1.6-branch/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp 2021-10-20 21:39:45 UTC (rev 284571)
@@ -51,9 +51,6 @@
#if ENABLE(ARKIT_INLINE_PREVIEW)
setModelElementCacheDirectory(WebsiteDataStore::defaultModelElementCacheDirectory());
#endif
-#if PLATFORM(IOS)
- setPCMMachServiceName("com.apple.webkit.adattributiond.service");
-#endif
}
}
Modified: branches/safari-613.1.6-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj (284570 => 284571)
--- branches/safari-613.1.6-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-10-20 21:35:45 UTC (rev 284570)
+++ branches/safari-613.1.6-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-10-20 21:39:45 UTC (rev 284571)
@@ -14541,7 +14541,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [[ \"${WK_PLATFORM_NAME}\" == iphoneos ]]; then\n DAEMON_PLIST_SOURCE=\"${SRCROOT}/Shared/EntryPointUtilities/Cocoa/Daemon/com.apple.webkit.adattributiond.plist\"\n DAEMON_PLIST_DESTINATION=\"${DSTROOT}/System/Library/LaunchDaemons/com.apple.webkit.adattributiond.plist\"\n echo \"copying adattributiond plist\"\n echo plutil -convert binary1 -o \"${DAEMON_PLIST_DESTINATION}\" \"${DAEMON_PLIST_SOURCE}\"\n plutil -convert binary1 -o \"${DAEMON_PLIST_DESTINATION}\" \"${DAEMON_PLIST_SOURCE}\"\nelse\n echo \"not copying adattributiond plist\"\nfi\n";
+ shellScript = "echo \"not copying adattributiond plist\"\n";
};
E1AC2E2C20F7B95800B0897D /* Unlock Keychain */ = {
isa = PBXShellScriptBuildPhase;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
