Bug 184960 – Fix entitlements and sandbox configurations in WebKit after r230778

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Wenson Hsieh]

<rdar://problem/39662827>

[Wenson Hsieh]

Created attachment 338711 [details]
Patch

[Wenson Hsieh]

Comment on attachment 338711 [details]
Patch

Oops..it seems the recommended way of doing this is to augment the _BASE config instead (e.g. WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_… = …).

[Wenson Hsieh]

Created attachment 338735 [details]
Patch

[Tim Horton]

Comment on attachment 338735 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=338735&action=review

> Source/WebKit/Configurations/BaseXPCService.xcconfig:59
> +CODE_SIGN_ENTITLEMENTS_watchos = $(CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_$(SKIP_INSTALL));

This one can use WK_COCOA_TOUCH

[Wenson Hsieh]

(In reply to Tim Horton from comment #4)
> Comment on attachment 338735 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=338735&action=review
> 
> > Source/WebKit/Configurations/BaseXPCService.xcconfig:59
> > +CODE_SIGN_ENTITLEMENTS_watchos = $(CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_$(SKIP_INSTALL));
> 
> This one can use WK_COCOA_TOUCH

Indeed — changed to use WK_COCOA_TOUCH.

Thanks for the review!

[Wenson Hsieh]

Created attachment 338769 [details]
Patch for landing

[WebKit Commit Bot]

Comment on attachment 338769 [details]
Patch for landing

Clearing flags on attachment: 338769

Committed r231014: <https://trac.webkit.org/changeset/231014>

[Wenson Hsieh]

Comment on attachment 338735 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=338735&action=review

>>> Source/WebKit/Configurations/BaseXPCService.xcconfig:59
>>> +CODE_SIGN_ENTITLEMENTS_watchos = $(CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_$(SKIP_INSTALL));
>> 
>> This one can use WK_COCOA_TOUCH
> 
> Indeed — changed to use WK_COCOA_TOUCH.
> 
> Thanks for the review!

.......on second thought, changing to use WK_COCOA_TOUCH here means that CODE_SIGN_ENTITLEMENTS_macos won't apply anymore, since CODE_SIGN_ENTITLEMENTS is no longer $(CODE_SIGN_ENTITLEMENTS_$(WK_PLATFORM_NAME))

[Tim Horton]

(In reply to Wenson Hsieh from comment #8)
> Comment on attachment 338735 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=338735&action=review
> 
> >>> Source/WebKit/Configurations/BaseXPCService.xcconfig:59
> >>> +CODE_SIGN_ENTITLEMENTS_watchos = $(CODE_SIGN_ENTITLEMENTS_IOS_SKIP_INSTALL_$(SKIP_INSTALL));
> >> 
> >> This one can use WK_COCOA_TOUCH
> > 
> > Indeed — changed to use WK_COCOA_TOUCH.
> > 
> > Thanks for the review!
> 
> .......on second thought, changing to use WK_COCOA_TOUCH here means that
> CODE_SIGN_ENTITLEMENTS_macos won't apply anymore, since
> CODE_SIGN_ENTITLEMENTS is no longer
> $(CODE_SIGN_ENTITLEMENTS_$(WK_PLATFORM_NAME))

Right, it ends up being CODE_SIGN_ENTITLEMENTS_ = ...

See also Jer’s IS_COCOA_TOUCH thing. There’s been a whole debate about this

[Wenson Hsieh]

Created attachment 339396 [details]
Patch

[Wenson Hsieh]

Comment on attachment 339396 [details]
Patch

Obsoleting — there's a better way to do this using WK_IS_COCOA_TOUCH.

[Tim Horton]

I did that in https://bugs.webkit.org/show_bug.cgi?id=185241