Title: [231014] trunk/Source/WebKit
- Revision
- 231014
- Author
- [email protected]
- Date
- 2018-04-25 13:13:23 -0700 (Wed, 25 Apr 2018)
Log Message
Fix entitlements and sandbox configurations in WebKit after r230778
https://bugs.webkit.org/show_bug.cgi?id=184960
<rdar://problem/39662827>
Reviewed by Tim Horton.
Build fixes for watchOS and tvOS after r230778.
* Configurations/BaseXPCService.xcconfig:
* Configurations/NetworkService.xcconfig:
* Configurations/WebContentService.xcconfig:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (231013 => 231014)
--- trunk/Source/WebKit/ChangeLog 2018-04-25 20:09:37 UTC (rev 231013)
+++ trunk/Source/WebKit/ChangeLog 2018-04-25 20:13:23 UTC (rev 231014)
@@ -1,3 +1,17 @@
+2018-04-25 Wenson Hsieh <[email protected]>
+
+ Fix entitlements and sandbox configurations in WebKit after r230778
+ https://bugs.webkit.org/show_bug.cgi?id=184960
+ <rdar://problem/39662827>
+
+ Reviewed by Tim Horton.
+
+ Build fixes for watchOS and tvOS after r230778.
+
+ * Configurations/BaseXPCService.xcconfig:
+ * Configurations/NetworkService.xcconfig:
+ * Configurations/WebContentService.xcconfig:
+
2018-04-25 Brent Fulgham <[email protected]>
Unreviewed build fix after r231008.
Modified: trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig (231013 => 231014)
--- trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig 2018-04-25 20:09:37 UTC (rev 231013)
+++ trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig 2018-04-25 20:13:23 UTC (rev 231014)
@@ -53,10 +53,8 @@
WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK_SHALLOW_BUNDLE_NO = ../../../../../..;
WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK_SHALLOW_BUNDLE_YES = ../..;
-CODE_SIGN_ENTITLEMENTS = $(CODE_SIGN_ENTITLEMENTS_$(WK_PLATFORM_NAME))
-CODE_SIGN_ENTITLEMENTS_iphoneos = $(CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_$(SKIP_INSTALL));
-CODE_SIGN_ENTITLEMENTS_iphonesimulator = $(CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_$(SKIP_INSTALL));
-CODE_SIGN_ENTITLEMENTS_iphoneminimalsimulator = $(CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_$(SKIP_INSTALL));
+CODE_SIGN_ENTITLEMENTS = $(CODE_SIGN_ENTITLEMENTS_$(WK_COCOA_TOUCH));
+CODE_SIGN_ENTITLEMENTS_cocoatouch = $(CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_$(SKIP_INSTALL));
CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_ = $(CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_NO);
CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_NO = $(CODE_SIGN_ENTITLEMENTS_IOS_MANUAL_SANDBOXING_$(WK_MANUAL_SANDBOXING_ENABLED));
Modified: trunk/Source/WebKit/Configurations/NetworkService.xcconfig (231013 => 231014)
--- trunk/Source/WebKit/Configurations/NetworkService.xcconfig 2018-04-25 20:09:37 UTC (rev 231013)
+++ trunk/Source/WebKit/Configurations/NetworkService.xcconfig 2018-04-25 20:13:23 UTC (rev 231014)
@@ -26,6 +26,10 @@
WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = $(WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_$(WK_PLATFORM_NAME));
WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_iphoneos = Network-iOS;
WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_iphonesimulator = Network-iOS;
+WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_watchos = Network-iOS;
+WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_watchsimulator = Network-iOS;
+WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_appletvos = Network-iOS;
+WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_appletvsimulator = Network-iOS;
WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_iphoneminimalsimulator = Network-iOS-minimalsimulator;
OTHER_CODE_SIGN_FLAGS = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS);
Modified: trunk/Source/WebKit/Configurations/WebContentService.xcconfig (231013 => 231014)
--- trunk/Source/WebKit/Configurations/WebContentService.xcconfig 2018-04-25 20:09:37 UTC (rev 231013)
+++ trunk/Source/WebKit/Configurations/WebContentService.xcconfig 2018-04-25 20:13:23 UTC (rev 231014)
@@ -26,6 +26,10 @@
WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE = $(WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_$(WK_PLATFORM_NAME));
WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_iphoneos = WebContent-iOS;
WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_iphonesimulator = WebContent-iOS;
+WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_watchos = WebContent-iOS;
+WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_watchsimulator = WebContent-iOS;
+WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_appletvos = WebContent-iOS;
+WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_appletvsimulator = WebContent-iOS;
WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_iphoneminimalsimulator = WebContent-iOS-minimalsimulator;
CODE_SIGN_ENTITLEMENTS_macosx = $(CODE_SIGN_ENTITLEMENTS_OSX_WITH_XPC_DOMAIN_EXTENSION_$(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
