Changeset 284055 in webkit


Ignore:
Timestamp:
Oct 12, 2021 4:16:41 PM (3 years ago)
Author:
achristensen@apple.com
Message:

Rename AdAttributionDaemon to adattributiond
​https://bugs.webkit.org/show_bug.cgi?id=231620

Reviewed by Kate Cheney.

Source/WebKit:

adattributiond is its approved name in rdar://80701098 and we already used it in some places.
Use it consistently.

  • Configurations/adattributiond.xcconfig: Renamed from Source/WebKit/Configurations/AdAttributionDaemon.xcconfig.
  • Resources/SandboxProfiles/ios/com.apple.WebKit.adattributiond.sb: Renamed from Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.AdAttributionDaemon.sb.
  • Scripts/process-entitlements.sh:
  • Shared/EntryPointUtilities/Cocoa/Daemon/adattributiond.c: Renamed from Source/WebKit/Shared/EntryPointUtilities/Cocoa/Daemon/AdAttributionDaemon.c.
  • WebKit.xcodeproj/project.pbxproj:

Tools:

  • TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm:

(TestWebKitAPI::testPCMDaemonLocation):
(TestWebKitAPI::cleanUpDaemon):

Location:
trunk
Files:
3 added
3 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r284051 r284055  
     12021-10-12  Alex Christensen  <achristensen@webkit.org>
     2
     3        Rename AdAttributionDaemon to adattributiond
     4        https://bugs.webkit.org/show_bug.cgi?id=231620
     5
     6        Reviewed by Kate Cheney.
     7
     8        adattributiond is its approved name in rdar://80701098 and we already used it in some places.
     9        Use it consistently.
     10
     11        * Configurations/adattributiond.xcconfig: Renamed from Source/WebKit/Configurations/AdAttributionDaemon.xcconfig.
     12        * Resources/SandboxProfiles/ios/com.apple.WebKit.adattributiond.sb: Renamed from Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.AdAttributionDaemon.sb.
     13        * Scripts/process-entitlements.sh:
     14        * Shared/EntryPointUtilities/Cocoa/Daemon/adattributiond.c: Renamed from Source/WebKit/Shared/EntryPointUtilities/Cocoa/Daemon/AdAttributionDaemon.c.
     15        * WebKit.xcodeproj/project.pbxproj:
     16
    1172021-10-12  Alex Christensen  <achristensen@webkit.org>
    218

  • trunk/Source/WebKit/Scripts/process-entitlements.sh

    r283977 r284055  
    120120        plistbuddy Add :com.apple.rootless.storage.WebKitNetworkingSandbox bool YES
    121121        plistbuddy Add :com.apple.symptom_analytics.configure bool YES
    122         plistbuddy Add :com.apple.private.webkit.adattributiondaemon bool YES
     122        plistbuddy Add :com.apple.private.webkit.adattributiond bool YES
    123123    fi
    124124}
    … …  
    375375{
    376376    plistbuddy Add :seatbelt-profiles array
    377     plistbuddy Add :seatbelt-profiles:0 string com.apple.WebKit.AdAttributionDaemon
     377    plistbuddy Add :seatbelt-profiles:0 string com.apple.webkit.adattributiond
    378378}
    379379
    380380function ios_family_process_network_entitlements()
    381381{
    382     plistbuddy Add :com.apple.private.webkit.adattributiondaemon bool YES
     382    plistbuddy Add :com.apple.private.webkit.adattributiond bool YES
    383383    plistbuddy Add :com.apple.multitasking.systemappassertions bool YES
    384384    plistbuddy Add :com.apple.payment.all-access bool YES
    … …  
    415415if [[ "${WK_PLATFORM_NAME}" =~ .*simulator ]]
    416416then
    417     if [[ "${PRODUCT_NAME}" != AdAttributionDaemon ]]; then
     417    if [[ "${PRODUCT_NAME}" != adattributiond ]]; then
    418418        cp "${CODE_SIGN_ENTITLEMENTS}" "${WK_PROCESSED_XCENT_FILE}"
    419419    fi
    … …  
    451451    elif [[ "${PRODUCT_NAME}" == com.apple.WebKit.GPU ]]; then ios_family_process_gpu_entitlements
    452452    elif [[ "${PRODUCT_NAME}" == com.apple.WebKit.WebAuthn ]]; then ios_family_process_webauthn_entitlements
    453     elif [[ "${PRODUCT_NAME}" == AdAttributionDaemon ]]; then
     453    elif [[ "${PRODUCT_NAME}" == adattributiond ]]; then
    454454        ios_family_process_adattributiond_entitlements
    455455    else echo "Unsupported/unknown product: ${PRODUCT_NAME}"

  • trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/Daemon/PCMDaemonEntryPoint.mm

    r283930 r284055  
    8282
    8383#if USE(APPLE_INTERNAL_SDK)
    84         if (!WTF::hasEntitlement(peer, "com.apple.private.webkit.adattributiondaemon")) {
     84        if (!WTF::hasEntitlement(peer, "com.apple.private.webkit.adattributiond")) {
    8585            NSLog(@"Connection attempted without required entitlement");
    8686            xpc_connection_cancel(peer);

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

    r284049 r284055  
    12881288                5CABDC8722C40FED001EDE8E /* APIMessageListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CABDC8322C40FA7001EDE8E /* APIMessageListener.h */; };
    12891289                5CADDE05215046BD0067D309 /* WKWebProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C74300E21500492004BFA17 /* WKWebProcess.h */; settings = {ATTRIBUTES = (Private, ); }; };
    1290                 5CAF7AA726F93AB00003F19E /* AdAttributionDaemon.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CAF7AA526F93A950003F19E /* AdAttributionDaemon.c */; };
     1290                5CAF7AA726F93AB00003F19E /* adattributiond.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CAF7AA526F93A950003F19E /* adattributiond.c */; };
    12911291                5CAFDE452130846300B1F7E1 /* _WKInspector.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CAFDE422130843500B1F7E1 /* _WKInspector.h */; settings = {ATTRIBUTES = (Private, ); }; };
    12921292                5CAFDE472130846A00B1F7E1 /* _WKInspectorInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CAFDE442130843600B1F7E1 /* _WKInspectorInternal.h */; };
    … …  
    45104510                5C1427151C23F8B000D41183 /* LegacyCustomProtocolManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LegacyCustomProtocolManager.messages.in; sourceTree = "<group>"; };
    45114511                5C14271B1C23F8CC00D41183 /* LegacyCustomProtocolManagerCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LegacyCustomProtocolManagerCocoa.mm; sourceTree = "<group>"; };
    4512                 5C1578E5270E0DBC00ED5280 /* com.apple.WebKit.AdAttributionDaemon.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.apple.WebKit.AdAttributionDaemon.sb; sourceTree = "<group>"; };
     4512                5C1578E5270E0DBC00ED5280 /* com.apple.WebKit.adattributiond.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.apple.WebKit.adattributiond.sb; sourceTree = "<group>"; };
    45134513                5C19A51E1FD0B14600EEA323 /* URLSchemeTaskParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = URLSchemeTaskParameters.cpp; sourceTree = "<group>"; };
    45144514                5C19A51F1FD0B14700EEA323 /* URLSchemeTaskParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = URLSchemeTaskParameters.h; sourceTree = "<group>"; };
    … …  
    45914591                5CABDC8522C40FCC001EDE8E /* WKMessageListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMessageListener.h; sourceTree = "<group>"; };
    45924592                5CADDE0D2151AA010067D309 /* AuthenticationChallengeDisposition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationChallengeDisposition.h; sourceTree = "<group>"; };
    4593                 5CAF7AA426F93A750003F19E /* AdAttributionDaemon */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = AdAttributionDaemon; sourceTree = BUILT_PRODUCTS_DIR; };
    4594                 5CAF7AA526F93A950003F19E /* AdAttributionDaemon.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = AdAttributionDaemon.c; sourceTree = "<group>"; };
    4595                 5CAF7AA626F93AA50003F19E /* AdAttributionDaemon.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AdAttributionDaemon.xcconfig; sourceTree = "<group>"; };
     4593                5CAF7AA426F93A750003F19E /* adattributiond */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = adattributiond; sourceTree = BUILT_PRODUCTS_DIR; };
     4594                5CAF7AA526F93A950003F19E /* adattributiond.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = adattributiond.c; sourceTree = "<group>"; };
     4595                5CAF7AA626F93AA50003F19E /* adattributiond.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = adattributiond.xcconfig; sourceTree = "<group>"; };
    45964596                5CAFDE422130843500B1F7E1 /* _WKInspector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKInspector.h; sourceTree = "<group>"; };
    45974597                5CAFDE432130843600B1F7E1 /* _WKInspector.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKInspector.mm; sourceTree = "<group>"; };
    … …  
    62876287                        isa = PBXGroup;
    62886288                        children = (
    6289                                 5CAF7AA426F93A750003F19E /* AdAttributionDaemon */,
     6289                                5CAF7AA426F93A750003F19E /* adattributiond */,
    62906290                                2D9FB228237523830049F936 /* com.apple.WebKit.GPU.xpc */,
    62916291                                BC8283B116B4BF7700A278FE /* com.apple.WebKit.Networking.xpc */,
    … …  
    67236723                        isa = PBXGroup;
    67246724                        children = (
    6725                                 5CAF7AA626F93AA50003F19E /* AdAttributionDaemon.xcconfig */,
     6725                                5CAF7AA626F93AA50003F19E /* adattributiond.xcconfig */,
    67266726                                A1EDD2D91884ACE000BBFE98 /* All.xcconfig */,
    67276727                                1A4F976A100E7B6600637A18 /* Base.xcconfig */,
    … …  
    95069506                        isa = PBXGroup;
    95079507                        children = (
    9508                                 5CAF7AA526F93A950003F19E /* AdAttributionDaemon.c */,
     9508                                5CAF7AA526F93A950003F19E /* adattributiond.c */,
    95099509                                5C6289A827068EC000CF5EC6 /* PCMDaemonConnectionSet.h */,
    95109510                                5C6289A927068EC000CF5EC6 /* PCMDaemonConnectionSet.mm */,
    … …  
    1001410014                        isa = PBXGroup;
    1001510015                        children = (
    10016                                 5C1578E5270E0DBC00ED5280 /* com.apple.WebKit.AdAttributionDaemon.sb */,
     10016                                5C1578E5270E0DBC00ED5280 /* com.apple.WebKit.adattributiond.sb */,
    1001710017                                2DB96052239886B900102791 /* com.apple.WebKit.GPU.sb */,
    1001810018                                A78CCDD8193AC9E3005ECC25 /* com.apple.WebKit.Networking.sb */,
    … …  
    1352513525                        productType = "com.apple.product-type.xpc-service";
    1352613526                };
    13527                 5CAF7A9926F93A750003F19E /* AdAttributionDaemon */ = {
     13527                5CAF7A9926F93A750003F19E /* adattributiond */ = {
    1352813528                        isa = PBXNativeTarget;
    13529                         buildConfigurationList = 5CAF7AA026F93A750003F19E /* Build configuration list for PBXNativeTarget "AdAttributionDaemon" */;
     13529                        buildConfigurationList = 5CAF7AA026F93A750003F19E /* Build configuration list for PBXNativeTarget "adattributiond" */;
    1353013530                        buildPhases = (
    1353113531                                5CAF7A9C26F93A750003F19E /* Headers */,
    1353213532                                5CAF7A9D26F93A750003F19E /* Sources */,
    1353313533                                5CAF7A9F26F93A750003F19E /* Frameworks */,
    13534                                 5C1578E6270E129400ED5280 /* Process AdAttributionDaemon Entitlements */,
     13534                                5C1578E6270E129400ED5280 /* Process adattributiond Entitlements */,
    1353513535                        );
    1353613536                        buildRules = (
    … …  
    1354013540                                5CAF7A9A26F93A750003F19E /* PBXTargetDependency */,
    1354113541                        );
    13542                         name = AdAttributionDaemon;
     13542                        name = adattributiond;
    1354313543                        productName = PluginProcessShim;
    13544                         productReference = 5CAF7AA426F93A750003F19E /* AdAttributionDaemon */;
     13544                        productReference = 5CAF7AA426F93A750003F19E /* adattributiond */;
    1354513545                        productType = "com.apple.product-type.tool";
    1354613546                };
    … …  
    1375513755                                5325BDCD21DFF47700A0DEE1 /* Apply Configuration to XCFileLists */,
    1375613756                                942DB232257EE6D4009BD80A /* EmptyDSTROOT */,
    13757                                 5CAF7A9926F93A750003F19E /* AdAttributionDaemon */,
     13757                                5CAF7A9926F93A750003F19E /* adattributiond */,
    1375813758                        );
    1375913759                };
    … …  
    1403914039                                "$(SRCROOT)/Resources/SandboxProfiles/ios/com.apple.WebKit.GPU.sb",
    1404014040                                "$(SRCROOT)/Resources/SandboxProfiles/ios/com.apple.WebKit.WebAuthn.sb",
    14041                                 "$(SRCROOT)/Resources/SandboxProfiles/ios/com.apple.WebKit.AdAttributionDaemon.sb",
     14041                                "$(SRCROOT)/Resources/SandboxProfiles/ios/com.apple.WebKit.adattributiond.sb",
    1404214042                        );
    1404314043                        name = "Copy iOS Sandbox Profiles for Manual Sandboxing";
    … …  
    1416114161                        shellScript = "Scripts/process-entitlements.sh\n";
    1416214162                };
    14163                 5C1578E6270E129400ED5280 /* Process AdAttributionDaemon Entitlements */ = {
     14163                5C1578E6270E129400ED5280 /* Process adattributiond Entitlements */ = {
    1416414164                        isa = PBXShellScriptBuildPhase;
    1416514165                        buildActionMask = 2147483647;
    … …  
    1417114171                                "$(SRCROOT)/Scripts/process-entitlements.sh",
    1417214172                        );
    14173                         name = "Process AdAttributionDaemon Entitlements";
     14173                        name = "Process adattributiond Entitlements";
    1417414174                        outputFileListPaths = (
    1417514175                        );
    … …  
    1445614456                        buildActionMask = 2147483647;
    1445714457                        files = (
    14458                                 5CAF7AA726F93AB00003F19E /* AdAttributionDaemon.c in Sources */,
     14458                                5CAF7AA726F93AB00003F19E /* adattributiond.c in Sources */,
    1445914459                        );
    1446014460                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    1503715037                5CAF7AA926F93F9F0003F19E /* PBXTargetDependency */ = {
    1503815038                        isa = PBXTargetDependency;
    15039                         target = 5CAF7A9926F93A750003F19E /* AdAttributionDaemon */;
     15039                        target = 5CAF7A9926F93A750003F19E /* adattributiond */;
    1504015040                        targetProxy = 5CAF7AA826F93F9F0003F19E /* PBXContainerItemProxy */;
    1504115041                };
    … …  
    1532115321                5CAF7AA126F93A750003F19E /* Debug */ = {
    1532215322                        isa = XCBuildConfiguration;
    15323                         baseConfigurationReference = 5CAF7AA626F93AA50003F19E /* AdAttributionDaemon.xcconfig */;
     15323                        baseConfigurationReference = 5CAF7AA626F93AA50003F19E /* adattributiond.xcconfig */;
    1532415324                        buildSettings = {
    1532515325                                OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
    … …  
    1533015330                5CAF7AA226F93A750003F19E /* Release */ = {
    1533115331                        isa = XCBuildConfiguration;
    15332                         baseConfigurationReference = 5CAF7AA626F93AA50003F19E /* AdAttributionDaemon.xcconfig */;
     15332                        baseConfigurationReference = 5CAF7AA626F93AA50003F19E /* adattributiond.xcconfig */;
    1533315333                        buildSettings = {
    1533415334                                OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
    … …  
    1533915339                5CAF7AA326F93A750003F19E /* Production */ = {
    1534015340                        isa = XCBuildConfiguration;
    15341                         baseConfigurationReference = 5CAF7AA626F93AA50003F19E /* AdAttributionDaemon.xcconfig */;
     15341                        baseConfigurationReference = 5CAF7AA626F93AA50003F19E /* adattributiond.xcconfig */;
    1534215342                        buildSettings = {
    1534315343                                OTHER_LDFLAGS = "$(OTHER_LDFLAGS)";
    … …  
    1568815688                        defaultConfigurationName = Production;
    1568915689                };
    15690                 5CAF7AA026F93A750003F19E /* Build configuration list for PBXNativeTarget "AdAttributionDaemon" */ = {
     15690                5CAF7AA026F93A750003F19E /* Build configuration list for PBXNativeTarget "adattributiond" */ = {
    1569115691                        isa = XCConfigurationList;
    1569215692                        buildConfigurations = (

  • trunk/Tools/ChangeLog

    r284048 r284055  
     12021-10-12  Alex Christensen  <achristensen@webkit.org>
     2
     3        Rename AdAttributionDaemon to adattributiond
     4        https://bugs.webkit.org/show_bug.cgi?id=231620
     5
     6        Reviewed by Kate Cheney.
     7
     8        * TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm:
     9        (TestWebKitAPI::testPCMDaemonLocation):
     10        (TestWebKitAPI::cleanUpDaemon):
     11
    1122021-10-12  Myles C. Maxfield  <mmaxfield@apple.com>
    213

  • trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/EventAttribution.mm

    r283586 r284055  
    401401static RetainPtr<NSURL> testPCMDaemonLocation()
    402402{
    403     return [currentExecutableDirectory() URLByAppendingPathComponent:@"AdAttributionDaemon" isDirectory:NO];
     403    return [currentExecutableDirectory() URLByAppendingPathComponent:@"adattributiond" isDirectory:NO];
    404404}
    405405
    … …  
    468468    EXPECT_NULL(error);
    469469
    470     system("killall AdAttributionDaemon -9 2> /dev/null");
     470    system("killall adattributiond -9 2> /dev/null");
    471471
    472472    auto plist = testDaemonPList(tempDir);
    … …  
    495495static void cleanUpDaemon(NSURL *tempDir)
    496496{
    497     system("killall AdAttributionDaemon -9");
     497    system("killall adattributiond -9");
    498498
    499499    EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:tempDir.path]);
Note: See TracChangeset for help on using the changeset viewer.