Title: [261116] trunk/Source/WebKit
- Revision
- 261116
- Author
- [email protected]
- Date
- 2020-05-04 15:08:46 -0700 (Mon, 04 May 2020)
Log Message
Stop hard-coding get-task-allow entitlement for simulator builds
https://bugs.webkit.org/show_bug.cgi?id=211392
Reviewed by Geoffrey Garen.
Stop hard-coding get-task-allow entitlement for simulator builds and let Xcode inject it as needed.
* Configurations/BaseXPCService.xcconfig:
* Resources/ios/XPCService-embedded-simulator.entitlements:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (261115 => 261116)
--- trunk/Source/WebKit/ChangeLog 2020-05-04 22:00:27 UTC (rev 261115)
+++ trunk/Source/WebKit/ChangeLog 2020-05-04 22:08:46 UTC (rev 261116)
@@ -1,3 +1,15 @@
+2020-05-04 Chris Dumez <[email protected]>
+
+ Stop hard-coding get-task-allow entitlement for simulator builds
+ https://bugs.webkit.org/show_bug.cgi?id=211392
+
+ Reviewed by Geoffrey Garen.
+
+ Stop hard-coding get-task-allow entitlement for simulator builds and let Xcode inject it as needed.
+
+ * Configurations/BaseXPCService.xcconfig:
+ * Resources/ios/XPCService-embedded-simulator.entitlements:
+
2020-05-04 Brent Fulgham <[email protected]>
REGRESSION (JazzkonE): ResourceLoadStatisticsDatabaseStore checks 'hasHadUserInteraction' without ensuring the domain has been added to the ITP database (211388)
Modified: trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig (261115 => 261116)
--- trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig 2020-05-04 22:00:27 UTC (rev 261115)
+++ trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig 2020-05-04 22:08:46 UTC (rev 261116)
@@ -63,9 +63,13 @@
WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK_SHALLOW_BUNDLE_NO_DEPLOYMENT_NO = ../../..;
WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK_SHALLOW_BUNDLE_YES_DEPLOYMENT_NO = ..;
-// We want this to always be NO. If set to YES, Xcode will invoke codesign with an --entitlements parameter that points to the platform's BaseEntitlements.plist. This parameter would override any --entitlements parameter that we establish in WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS, causing our entitlements to be ignored.
+// We want this to always be NO for non-simulator builds. If set to YES, Xcode will invoke codesign with an --entitlements parameter that points to the platform's BaseEntitlements.plist. This parameter would override any --entitlements parameter that we establish in WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS, causing our entitlements to be ignored.
CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
+CODE_SIGN_INJECT_BASE_ENTITLEMENTS[sdk=*simulator] = YES;
+// For simulator builds, entitlements are added to a special __entitlements section on the binary rather than the signature.
+CODE_SIGN_ENTITLEMENTS[sdk=*simulator] = Resources/ios/XPCService-embedded-simulator.entitlements
+
WK_PROCESSED_XCENT_FILE=$(TEMP_FILE_DIR)/$(FULL_PRODUCT_NAME).entitlements
WK_LIBRARY_VALIDATION_ENABLED = $(WK_LIBRARY_VALIDATION_ENABLED_$(WK_EMPTY_$(WK_LIBRARY_VALIDATION_ENABLED)));
@@ -86,10 +90,4 @@
WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_macfamily_VARIANT_Normal_VALIDATION_YES = -o library;
WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_iosdevicefamily = --entitlements $(WK_PROCESSED_XCENT_FILE);
-// For simulator builds, entitlements are added to a special __entitlements section on the binary rather than the signature.
-CODE_SIGN_ENTITLEMENTS = $(CODE_SIGN_ENTITLEMENTS_$(WK_PLATFORM_NAME));
-CODE_SIGN_ENTITLEMENTS_iphonesimulator = Resources/ios/XPCService-embedded-simulator.entitlements
-CODE_SIGN_ENTITLEMENTS_appletvsimulator = Resources/ios/XPCService-embedded-simulator.entitlements
-CODE_SIGN_ENTITLEMENTS_watchsimulator = Resources/ios/XPCService-embedded-simulator.entitlements
-
OTHER_CODE_SIGN_FLAGS = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS);
Modified: trunk/Source/WebKit/Resources/ios/XPCService-embedded-simulator.entitlements (261115 => 261116)
--- trunk/Source/WebKit/Resources/ios/XPCService-embedded-simulator.entitlements 2020-05-04 22:00:27 UTC (rev 261115)
+++ trunk/Source/WebKit/Resources/ios/XPCService-embedded-simulator.entitlements 2020-05-04 22:08:46 UTC (rev 261116)
@@ -2,8 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>com.apple.security.get-task-allow</key>
- <true/>
<key>com.apple.runningboard.assertions.webkit</key>
<true/>
</dict>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
