Diff
Modified: trunk/Source/WebKit/ChangeLog (239818 => 239819)
--- trunk/Source/WebKit/ChangeLog 2019-01-10 05:23:26 UTC (rev 239818)
+++ trunk/Source/WebKit/ChangeLog 2019-01-10 08:02:31 UTC (rev 239819)
@@ -1,3 +1,16 @@
+2019-01-10 Tim Horton <timothy_hor...@apple.com>
+
+ Rename some entitlements files to be more clear about their target platform
+ https://bugs.webkit.org/show_bug.cgi?id=193311
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Network-iOSMac.entitlements: Renamed from Source/WebKit/Configurations/Network-iOS-minimalsimulator.entitlements.
+ * Configurations/NetworkService.xcconfig:
+ * Configurations/WebContent-iOSMac.entitlements: Renamed from Source/WebKit/Configurations/WebContent-iOS-minimalsimulator.entitlements.
+ * Configurations/WebContentService.xcconfig:
+ * WebKit.xcodeproj/project.pbxproj:
+
2019-01-09 Brent Fulgham <bfulg...@apple.com>
Unreviewed build fix after r239816.
Deleted: trunk/Source/WebKit/Configurations/Network-iOS-minimalsimulator.entitlements (239818 => 239819)
--- trunk/Source/WebKit/Configurations/Network-iOS-minimalsimulator.entitlements 2019-01-10 05:23:26 UTC (rev 239818)
+++ trunk/Source/WebKit/Configurations/Network-iOS-minimalsimulator.entitlements 2019-01-10 08:02:31 UTC (rev 239819)
@@ -1,12 +0,0 @@
-<?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>seatbelt-profiles</key>
- <array>
- <string>com.apple.WebKit.Networking</string>
- </array>
- <key>com.apple.security.network.client</key>
- <true/>
-</dict>
-</plist>
Copied: trunk/Source/WebKit/Configurations/Network-iOSMac.entitlements (from rev 239817, trunk/Source/WebKit/Configurations/Network-iOS-minimalsimulator.entitlements) (0 => 239819)
--- trunk/Source/WebKit/Configurations/Network-iOSMac.entitlements (rev 0)
+++ trunk/Source/WebKit/Configurations/Network-iOSMac.entitlements 2019-01-10 08:02:31 UTC (rev 239819)
@@ -0,0 +1,12 @@
+<?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>seatbelt-profiles</key>
+ <array>
+ <string>com.apple.WebKit.Networking</string>
+ </array>
+ <key>com.apple.security.network.client</key>
+ <true/>
+</dict>
+</plist>
Modified: trunk/Source/WebKit/Configurations/NetworkService.xcconfig (239818 => 239819)
--- trunk/Source/WebKit/Configurations/NetworkService.xcconfig 2019-01-10 05:23:26 UTC (rev 239818)
+++ trunk/Source/WebKit/Configurations/NetworkService.xcconfig 2019-01-10 08:02:31 UTC (rev 239819)
@@ -30,7 +30,7 @@
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_iosmac = Network-iOS-minimalsimulator;
+WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_iosmac = Network-iOSMac;
CODE_SIGN_ENTITLEMENTS_COCOA_TOUCH_NO = Configurations/Network-OSX.entitlements;
OTHER_CODE_SIGN_FLAGS = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS);
Deleted: trunk/Source/WebKit/Configurations/WebContent-iOS-minimalsimulator.entitlements (239818 => 239819)
--- trunk/Source/WebKit/Configurations/WebContent-iOS-minimalsimulator.entitlements 2019-01-10 05:23:26 UTC (rev 239818)
+++ trunk/Source/WebKit/Configurations/WebContent-iOS-minimalsimulator.entitlements 2019-01-10 08:02:31 UTC (rev 239819)
@@ -1,12 +0,0 @@
-<?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>seatbelt-profiles</key>
- <array>
- <string>com.apple.WebKit.WebContent</string>
- </array>
- <key>com.apple.security.cs.allow-jit</key>
- <true/>
-</dict>
-</plist>
Copied: trunk/Source/WebKit/Configurations/WebContent-iOSMac.entitlements (from rev 239817, trunk/Source/WebKit/Configurations/WebContent-iOS-minimalsimulator.entitlements) (0 => 239819)
--- trunk/Source/WebKit/Configurations/WebContent-iOSMac.entitlements (rev 0)
+++ trunk/Source/WebKit/Configurations/WebContent-iOSMac.entitlements 2019-01-10 08:02:31 UTC (rev 239819)
@@ -0,0 +1,12 @@
+<?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>seatbelt-profiles</key>
+ <array>
+ <string>com.apple.WebKit.WebContent</string>
+ </array>
+ <key>com.apple.security.cs.allow-jit</key>
+ <true/>
+</dict>
+</plist>
Modified: trunk/Source/WebKit/Configurations/WebContentService.xcconfig (239818 => 239819)
--- trunk/Source/WebKit/Configurations/WebContentService.xcconfig 2019-01-10 05:23:26 UTC (rev 239818)
+++ trunk/Source/WebKit/Configurations/WebContentService.xcconfig 2019-01-10 08:02:31 UTC (rev 239819)
@@ -30,7 +30,7 @@
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_iosmac = WebContent-iOS-minimalsimulator;
+WK_XPC_SERVICE_IOS_ENTITLEMENTS_BASE_iosmac = WebContent-iOSMac;
CODE_SIGN_ENTITLEMENTS_COCOA_TOUCH_NO = Configurations/WebContent-OSX.entitlements;
OTHER_CODE_SIGN_FLAGS = $(WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS);
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (239818 => 239819)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2019-01-10 05:23:26 UTC (rev 239818)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2019-01-10 08:02:31 UTC (rev 239819)
@@ -2899,8 +2899,8 @@
370F34A41829BEA3009027C8 /* WKNavigationDataInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationDataInternal.h; sourceTree = "<group>"; };
370F34A61829CFF3009027C8 /* WKBrowsingContextHistoryDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBrowsingContextHistoryDelegate.h; sourceTree = "<group>"; };
37119A7C20CCB64E002C6DC9 /* WebKitTargetConditionals.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKitTargetConditionals.xcconfig; sourceTree = "<group>"; };
- 37119A7D20CCB64E002C6DC9 /* Network-iOS-minimalsimulator.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Network-iOS-minimalsimulator.entitlements"; sourceTree = "<group>"; };
- 37119A7E20CCB64E002C6DC9 /* WebContent-iOS-minimalsimulator.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "WebContent-iOS-minimalsimulator.entitlements"; sourceTree = "<group>"; };
+ 37119A7D20CCB64E002C6DC9 /* Network-iOSMac.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Network-iOSMac.entitlements"; sourceTree = "<group>"; };
+ 37119A7E20CCB64E002C6DC9 /* WebContent-iOSMac.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "WebContent-iOSMac.entitlements"; sourceTree = "<group>"; };
37183D54182F4E700080C811 /* WKNSURLExtras.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNSURLExtras.mm; sourceTree = "<group>"; };
37183D55182F4E700080C811 /* WKNSURLExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNSURLExtras.h; sourceTree = "<group>"; };
371A193F1824D29300F32A5E /* WKNSDictionary.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNSDictionary.mm; sourceTree = "<group>"; };
@@ -4836,8 +4836,8 @@
A7BD9863194653D400D35698 /* Databases-iOS.entitlements */,
1A4F976B100E7B6600637A18 /* DebugRelease.xcconfig */,
1A4F976C100E7B6600637A18 /* FeatureDefines.xcconfig */,
- 37119A7D20CCB64E002C6DC9 /* Network-iOS-minimalsimulator.entitlements */,
7C0BB9A918DCDF5A0006C086 /* Network-iOS.entitlements */,
+ 37119A7D20CCB64E002C6DC9 /* Network-iOSMac.entitlements */,
5C6F4EED21E5B11300BC8380 /* Network-OSX-restricted.entitlements */,
41D0FC7D20E43A5100076AE8 /* Network-OSX-sandbox.entitlements */,
5C7ACFD1218DD8BD004CBB59 /* Network-OSX.entitlements */,
@@ -4850,8 +4850,8 @@
A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */,
5183B3931379F85C00E8754E /* Shim.xcconfig */,
1A4F976E100E7B6600637A18 /* Version.xcconfig */,
- 37119A7E20CCB64E002C6DC9 /* WebContent-iOS-minimalsimulator.entitlements */,
7C0BB9A818DCDE890006C086 /* WebContent-iOS.entitlements */,
+ 37119A7E20CCB64E002C6DC9 /* WebContent-iOSMac.entitlements */,
37B418EB1C9624F20031E63B /* WebContent-or-Plugin-OSX-restricted.entitlements */,
4188C158211378520012ABCD /* WebContent-OSX-sandbox.entitlements */,
7AF66E1120C07CB6007828EA /* WebContent-OSX.entitlements */,
@@ -10369,8 +10369,8 @@
"$(SRCROOT)/Configurations/Databases-iOS.entitlements",
"$(SRCROOT)/Configurations/Network-iOS.entitlements",
"$(SRCROOT)/Configurations/WebContent-iOS.entitlements",
- "$(SRCROOT)/Configurations/Network-iOS-minimalsimulator.entitlements",
- "$(SRCROOT)/Configurations/WebContent-iOS-minimalsimulator.entitlements",
+ "$(SRCROOT)/Configurations/Network-iOSMac.entitlements",
+ "$(SRCROOT)/Configurations/WebContent-iOSMac.entitlements",
);
name = "Derive Entitlements for Manual Sandboxing";
outputPaths = (
@@ -10377,8 +10377,8 @@
"$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/Databases-iOS-no-sandbox.entitlements",
"$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/Network-iOS-no-sandbox.entitlements",
"$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/WebContent-iOS-no-sandbox.entitlements",
- "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/Network-iOS-minimalsimulator-no-sandbox.entitlements",
- "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/WebContent-iOS-minimalsimulator-no-sandbox.entitlements",
+ "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/Network-iOSMac-no-sandbox.entitlements",
+ "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/WebContent-iOSMac-no-sandbox.entitlements",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;