[webkit-changes] [261015] trunk/Source/WebKit

Fri, 01 May 2020 13:11:22 -0700

Title: [261015] trunk/Source/WebKit
Revision
261015
Author
[email protected]
Date
2020-05-01 13:09:43 -0700 (Fri, 01 May 2020)

Log Message

[iOS] Unable to take RunningBoard process assertions in the iOS Simulator
https://bugs.webkit.org/show_bug.cgi?id=211254
<rdar://problem/62674074>

Reviewed by Tim Horton.

* Configurations/BaseXPCService.xcconfig:
Use this directive to add our entitlements:
    CODE_SIGN_ENTITLEMENTS = $(WK_PROCESSED_XCENT_FILE);
instead of using:
    OTHER_CODE_SIGN_FLAGS = --entitlements $(WK_PROCESSED_XCENT_FILE);
This is important because entitlements are added differently for iOS Simulator builds,
so that they only apply inside the simulator (and not for the host system). If we use
CODE_SIGN_ENTITLEMENTS, then XCode does the right thing on all platforms.

* Scripts/process-entitlements.sh:
Add com.apple.runningboard.assertions.webkit entitlement to iOS Simulator builds.

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (261014 => 261015)


--- trunk/Source/WebKit/ChangeLog	2020-05-01 19:50:02 UTC (rev 261014)
+++ trunk/Source/WebKit/ChangeLog	2020-05-01 20:09:43 UTC (rev 261015)
@@ -1,3 +1,23 @@
+2020-05-01  Chris Dumez  <[email protected]>
+
+        [iOS] Unable to take RunningBoard process assertions in the iOS Simulator
+        https://bugs.webkit.org/show_bug.cgi?id=211254
+        <rdar://problem/62674074>
+
+        Reviewed by Tim Horton.
+
+        * Configurations/BaseXPCService.xcconfig:
+        Use this directive to add our entitlements:
+            CODE_SIGN_ENTITLEMENTS = $(WK_PROCESSED_XCENT_FILE);
+        instead of using:
+            OTHER_CODE_SIGN_FLAGS = --entitlements $(WK_PROCESSED_XCENT_FILE);
+        This is important because entitlements are added differently for iOS Simulator builds,
+        so that they only apply inside the simulator (and not for the host system). If we use
+        CODE_SIGN_ENTITLEMENTS, then XCode does the right thing on all platforms.
+
+        * Scripts/process-entitlements.sh:
+        Add com.apple.runningboard.assertions.webkit entitlement to iOS Simulator builds.
+
 2020-05-01  Don Olmstead  <[email protected]>
 
         [GTK] Add additional exports to support hidden visibility

Modified: trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig (261014 => 261015)


--- trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig	2020-05-01 19:50:02 UTC (rev 261014)
+++ trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig	2020-05-01 20:09:43 UTC (rev 261015)
@@ -76,21 +76,13 @@
 WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_$(WK_PLATFORM_NAME));
 WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_macosx = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_macfamily);
 WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_maccatalyst = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_macfamily);
-WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_iphoneos = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_iosdevicefamily);
-WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_iphonesimulator = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_iossimulatorfamily);
-WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_appletvos = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_iosdevicefamily);
-WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_appletvsimulator = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_iossimulatorfamily);
-WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_watchos = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_iosdevicefamily);
-WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_watchsimulator = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_iossimulatorfamily);
 
-WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_macfamily = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_macfamily_VARIANT_$(WK_XPC_SERVICE_VARIANT)) --entitlements $(WK_PROCESSED_XCENT_FILE);
+WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_macfamily = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_macfamily_VARIANT_$(WK_XPC_SERVICE_VARIANT));
 WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_macfamily_VARIANT_ = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_macfamily_VARIANT_Normal);
 WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_macfamily_VARIANT_Normal = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_macfamily_VARIANT_Normal_VALIDATION_$(WK_LIBRARY_VALIDATION_ENABLED));
 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);
-WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_iossimulatorfamily = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_iossimulatorfamily_XBS_$(RC_XBS));
-WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_iossimulatorfamily_XBS_ = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_iossimulatorfamily_XBS_NO);
-WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_iossimulatorfamily_XBS_NO = --entitlements $(WK_PROCESSED_XCENT_FILE);
-WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS_iossimulatorfamily_XBS_YES = ;
 
 OTHER_CODE_SIGN_FLAGS = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS);
+
+CODE_SIGN_ENTITLEMENTS = $(WK_PROCESSED_XCENT_FILE);
+

Modified: trunk/Source/WebKit/Scripts/process-entitlements.sh (261014 => 261015)


--- trunk/Source/WebKit/Scripts/process-entitlements.sh	2020-05-01 19:50:02 UTC (rev 261014)
+++ trunk/Source/WebKit/Scripts/process-entitlements.sh	2020-05-01 20:09:43 UTC (rev 261015)
@@ -208,6 +208,7 @@
 if [[ "${WK_PLATFORM_NAME}" =~ .*simulator ]]
 then
     [[ "${RC_XBS}" != YES ]] && plistbuddy Add :com.apple.security.get-task-allow bool YES
+    plistbuddy Add :com.apple.runningboard.assertions.webkit bool YES
 elif [[ "${WK_PLATFORM_NAME}" == macosx ]]
 then
     [[ "${RC_XBS}" != YES ]] && plistbuddy Add :com.apple.security.get-task-allow bool YES

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to