Changeset 284570 in webkit

Timestamp:

Oct 20, 2021, 2:35:45 PM (5 years ago)

Author:

achristensen@apple.com

Message:

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:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp (modified) (1 diff)
• WebKit.xcodeproj/project.pbxproj (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-10-20  Alex Christensen  <achristensen@webkit.org>
+
+        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  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp

@@ -51 +51 @@
 #if ENABLE(ARKIT_INLINE_PREVIEW)
         setModelElementCacheDirectory(WebsiteDataStore::defaultModelElementCacheDirectory());
-#endif
-#if PLATFORM(IOS)
-        setPCMMachServiceName("com.apple.webkit.adattributiond.service");
 #endif
     }

trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -14567 +14567 @@
                         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 */ = {