Changeset 160661 in webkit

Timestamp:

Dec 16, 2013 2:07:18 PM (10 years ago)

Author:

benjamin@webkit.org

Message:

[WK2] The NetworkProcess tries to load SecItemShim.dylib on iOS
​https://bugs.webkit.org/show_bug.cgi?id=125800

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2013-12-16
Reviewed by Dan Bernstein.

Give the NetworkService its own Info.plist configured without the Shim.

• Configurations/NetworkService.xcconfig:
• NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist: Copied from Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info.plist.
• NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist: Renamed from Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info.plist.
• WebKit2.xcodeproj/project.pbxproj:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Configurations/NetworkService.xcconfig (modified) (1 diff)
• NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist (added)
• NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist (added)
• NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info.plist (deleted)
• WebKit2.xcodeproj/project.pbxproj (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-16  Benjamin Poulain  <bpoulain@apple.com>
+
+        [WK2] The NetworkProcess tries to load SecItemShim.dylib on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=125800
+
+        Reviewed by Dan Bernstein.
+
+        Give the NetworkService its own Info.plist configured without the Shim.
+
+        * Configurations/NetworkService.xcconfig:
+        * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist: Copied from Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info.plist.
+        * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist: Renamed from Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info.plist.
+        * WebKit2.xcodeproj/project.pbxproj:
+
 2013-12-16  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit2/Configurations/NetworkService.xcconfig

@@ -25 +25 @@
 
 PRODUCT_NAME = com.apple.WebKit.Networking;
-INFOPLIST_FILE = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info.plist;
+INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
+INFOPLIST_FILE_macosx = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist;
+INFOPLIST_FILE_iphoneos = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist;

trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

@@ -1907 +1907 @@
                 1F0181741858DC1600F92884 /* WKWebProcessPlugInScriptWorldInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInScriptWorldInternal.h; sourceTree = "<group>"; };
                 1F335BBF185B84D8001A201A /* WKWebProcessPlugInLoadDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInLoadDelegate.h; sourceTree = "<group>"; };
+                26659AA0185FAAED004303DD /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = "<group>"; };
                 290F4271172A0C7400939FF0 /* ChildProcessSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChildProcessSupplement.h; sourceTree = "<group>"; };
                 293EBEA91627D9C9005F89F1 /* WKDOMText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDOMText.h; sourceTree = "<group>"; };
@@ -2657 +2658 @@
                 BC82839716B480F600A278FE /* XPCServiceMain.Development.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = XPCServiceMain.Development.mm; sourceTree = "<group>"; };
                 BC82839816B48DC000A278FE /* WebContentServiceEntryPoint.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContentServiceEntryPoint.mm; sourceTree = "<group>"; };
-                BC8283A316B4BD9100A278FE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+                BC8283A316B4BD9100A278FE /* Info-OSX.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-OSX.plist"; sourceTree = "<group>"; };
                 BC8283A616B4BD9100A278FE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                 BC8283A816B4BD9100A278FE /* NetworkServiceEntryPoint.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkServiceEntryPoint.mm; sourceTree = "<group>"; };
@@ -5157 +5158 @@
                         isa = PBXGroup;
                         children = (
-                                BC8283A316B4BD9100A278FE /* Info.plist */,
+                                26659AA0185FAAED004303DD /* Info-iOS.plist */,
+                                BC8283A316B4BD9100A278FE /* Info-OSX.plist */,
                         );
                         path = NetworkService;