Title: [241191] trunk/Source/WebKit
Revision
241191
Author
[email protected]
Date
2019-02-08 00:48:35 -0800 (Fri, 08 Feb 2019)

Log Message

Unreviewed build fix.

r241135 modified how entitlements were built up for the macOS. Those
changes broke the iOSMac builds. Bring back some deletions in order to
fix iOSMac.

* Configurations/PluginService.64.xcconfig:
* Configurations/PluginService.entitlements: Added.
* WebKit.xcodeproj/project.pbxproj:

Modified Paths

Added Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (241190 => 241191)


--- trunk/Source/WebKit/ChangeLog	2019-02-08 08:37:26 UTC (rev 241190)
+++ trunk/Source/WebKit/ChangeLog	2019-02-08 08:48:35 UTC (rev 241191)
@@ -1,3 +1,15 @@
+2019-02-08  Keith Rollin  <[email protected]>
+
+        Unreviewed build fix.
+
+        r241135 modified how entitlements were built up for the macOS. Those
+        changes broke the iOSMac builds. Bring back some deletions in order to
+        fix iOSMac.
+
+        * Configurations/PluginService.64.xcconfig:
+        * Configurations/PluginService.entitlements: Added.
+        * WebKit.xcodeproj/project.pbxproj:
+
 2019-02-07  Chris Dumez  <[email protected]>
 
         Mark more heap-allocated classes as fast allocated

Modified: trunk/Source/WebKit/Configurations/PluginService.64.xcconfig (241190 => 241191)


--- trunk/Source/WebKit/Configurations/PluginService.64.xcconfig	2019-02-08 08:37:26 UTC (rev 241190)
+++ trunk/Source/WebKit/Configurations/PluginService.64.xcconfig	2019-02-08 08:48:35 UTC (rev 241191)
@@ -35,4 +35,7 @@
 OTHER_LDFLAGS = $(inherited) $(WK_APPKIT_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
 OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
 
+CODE_SIGN_ENTITLEMENTS_COCOA_TOUCH_YES = Configurations/PluginService.entitlements;
+WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS[sdk=macosx*] = --entitlements $(WK_PROCESSED_XCENT_FILE);
+
 SKIP_INSTALL[sdk=iphone*] = YES;

Added: trunk/Source/WebKit/Configurations/PluginService.entitlements (0 => 241191)


--- trunk/Source/WebKit/Configurations/PluginService.entitlements	                        (rev 0)
+++ trunk/Source/WebKit/Configurations/PluginService.entitlements	2019-02-08 08:48:35 UTC (rev 241191)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.cs.allow-jit</key>
+	<true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+	<key>com.apple.security.cs.disable-library-validation</key>
+	<true/>
+	<key>com.apple.security.files.user-selected.read-write</key>
+	<true/>
+	<key>com.apple.security.print</key>
+	<true/>
+</dict>
+</plist>

Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (241190 => 241191)


--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2019-02-08 08:37:26 UTC (rev 241190)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2019-02-08 08:48:35 UTC (rev 241191)
@@ -3348,6 +3348,7 @@
 		532159511DBAE6FC0054AA3C /* NetworkDataTask.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkDataTask.cpp; sourceTree = "<group>"; };
 		532159521DBAE6FC0054AA3C /* NetworkSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkSession.cpp; sourceTree = "<group>"; };
 		535BCB902069C49C00CCCE02 /* NetworkActivityTracker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NetworkActivityTracker.h; sourceTree = "<group>"; };
+		536F46D3220D385100126322 /* PluginService.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = PluginService.entitlements; sourceTree = "<group>"; };
 		539EB5461DC2EE40009D48CF /* NetworkDataTaskBlob.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkDataTaskBlob.cpp; sourceTree = "<group>"; };
 		539EB5471DC2EE40009D48CF /* NetworkDataTaskBlob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkDataTaskBlob.h; sourceTree = "<group>"; };
 		53B1640F2203715000EC4166 /* process-entitlements.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "process-entitlements.sh"; sourceTree = "<group>"; };
@@ -4841,6 +4842,7 @@
 				BC8283AB16B4BEAD00A278FE /* NetworkService.xcconfig */,
 				A1EDD2DB1884B96400BBFE98 /* PluginProcessShim.xcconfig */,
 				BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */,
+				536F46D3220D385100126322 /* PluginService.entitlements */,
 				37E83D401B37D27B002079EE /* SandboxProfiles.xcconfig */,
 				A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */,
 				5183B3931379F85C00E8754E /* Shim.xcconfig */,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to