WebKit Bugzilla
Attachment 338769 Details for
Bug 184960
: Fix entitlements and sandbox configurations in WebKit after r230778
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for landing
bug-184960-20180425122821.patch (text/plain), 4.24 KB, created by
Wenson Hsieh
on 2018-04-25 12:28:22 PDT
(
hide
)
Description:
Patch for landing
Filename:
MIME Type:
Creator:
Wenson Hsieh
Created:
2018-04-25 12:28:22 PDT
Size:
4.24 KB
patch
obsolete
>Subversion Revision: 230986 >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index fbde54931ec8a17d6a2a16953797e77e97fa99d1..c987370d00112451afeedd89d14836dfad7020d1 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,17 @@ >+2018-04-24 Wenson Hsieh <wenson_hsieh@apple.com> >+ >+ 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-24 Fujii Hironori <Hironori.Fujii@sony.com> > > [WinCairo] Add WKView and WKAPI >diff --git a/Source/WebKit/Configurations/BaseXPCService.xcconfig b/Source/WebKit/Configurations/BaseXPCService.xcconfig >index 93f9418c67530ff1881859da8047bba9597a5f5f..43a2a45df5e35d0d30d41a60a94334f2632adc86 100644 >--- a/Source/WebKit/Configurations/BaseXPCService.xcconfig >+++ b/Source/WebKit/Configurations/BaseXPCService.xcconfig >@@ -53,10 +53,8 @@ WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK = $(WK_PATH_FROM_SERVICE_EXECUTABLE > 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)); >diff --git a/Source/WebKit/Configurations/NetworkService.xcconfig b/Source/WebKit/Configurations/NetworkService.xcconfig >index 50b31c3d9281e9090408591f88a5266336a89500..5b602d60d8d486ca1a34b3d68752a329aa42b7a3 100644 >--- a/Source/WebKit/Configurations/NetworkService.xcconfig >+++ b/Source/WebKit/Configurations/NetworkService.xcconfig >@@ -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); >diff --git a/Source/WebKit/Configurations/WebContentService.xcconfig b/Source/WebKit/Configurations/WebContentService.xcconfig >index fbd92ba784db04703af6968a820d3395ed6c2763..20865746b42e7fef49f3a4e17de3002d5b7de56a 100644 >--- a/Source/WebKit/Configurations/WebContentService.xcconfig >+++ b/Source/WebKit/Configurations/WebContentService.xcconfig >@@ -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));
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 184960
:
338711
|
338735
|
338769
|
339396