Title: [261033] trunk/Source/WebKit
Revision
261033
Author
[email protected]
Date
2020-05-01 15:55:19 -0700 (Fri, 01 May 2020)

Log Message

Unreviewed, reverting r261015.

Seems to have broken clean builds

Reverted changeset:

"[iOS] Unable to take RunningBoard process assertions in the
iOS Simulator"
https://bugs.webkit.org/show_bug.cgi?id=211254
https://trac.webkit.org/changeset/261015

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (261032 => 261033)


--- trunk/Source/WebKit/ChangeLog	2020-05-01 22:54:39 UTC (rev 261032)
+++ trunk/Source/WebKit/ChangeLog	2020-05-01 22:55:19 UTC (rev 261033)
@@ -1,3 +1,16 @@
+2020-05-01  Chris Dumez  <[email protected]>
+
+        Unreviewed, reverting r261015.
+
+        Seems to have broken clean builds
+
+        Reverted changeset:
+
+        "[iOS] Unable to take RunningBoard process assertions in the
+        iOS Simulator"
+        https://bugs.webkit.org/show_bug.cgi?id=211254
+        https://trac.webkit.org/changeset/261015
+
 2020-05-01  David Kilzer  <[email protected]>
 
         [IPC hardening] createMessageDecoder() needs a validity check

Modified: trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig (261032 => 261033)


--- trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig	2020-05-01 22:54:39 UTC (rev 261032)
+++ trunk/Source/WebKit/Configurations/BaseXPCService.xcconfig	2020-05-01 22:55:19 UTC (rev 261033)
@@ -76,13 +76,21 @@
 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));
+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_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 (261032 => 261033)


--- trunk/Source/WebKit/Scripts/process-entitlements.sh	2020-05-01 22:54:39 UTC (rev 261032)
+++ trunk/Source/WebKit/Scripts/process-entitlements.sh	2020-05-01 22:55:19 UTC (rev 261033)
@@ -208,7 +208,6 @@
 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