Diff
Modified: trunk/Source/WebKit2/ChangeLog (194021 => 194022)
--- trunk/Source/WebKit2/ChangeLog 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-14 03:19:47 UTC (rev 194022)
@@ -1,5 +1,53 @@
2015-12-13 Dan Bernstein <[email protected]>
+ [Mac] Shims used by XPC services are installed inside legacy process bundles
+ https://bugs.webkit.org/show_bug.cgi?id=152233
+
+ Reviewed by Sam Weinig.
+
+ Have the shim dylibs installed in the framework’s Frameworks directory instead.
+
+ * Configurations/BaseLegacyProcess.xcconfig: Simplified now that EXCLUDED_SHIM_FILE_NAME is
+ no longer defined, because shims aren’t copied into legacy processes.
+
+ * Configurations/NetworkProcess.xcconfig: Removed definition of EXCLUDED_SHIM_FILE_NAME.
+ * Configurations/PluginProcess.xcconfig: Ditto.
+ * Configurations/WebContentProcess.xcconfig: Ditto.
+
+ * Configurations/Shim.xcconfig: Install the shims when building for OS X. Added definitions
+ of INSTALL_PATH and DYLIB_INSTALL_NAME_BASE which are now common to all shims.
+
+ * Configurations/PluginProcessShim.xcconfig: Removed definitions of INSTALL_PATH and
+ DYLIB_INSTALL_NAME_BASE from here, now that they are defined for all shims in
+ Shim.xcconfig.
+ * Configurations/SecItemShim.xcconfig: Ditto.
+ * Configurations/WebProcessShim.xcconfig:
+
+ * Configurations/WebKit.xcconfig: Added the shims to EXCLUDED_SOURCE_FILE_NAMES for iOS.
+
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist: Changed
+ the value of DYLD_INSERT_LIBRARIES to point to the shim’s new location.
+ * PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist: Ditto.
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist: Ditto.
+
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ (WebKit::computeProcessShimPath): Changed to return the new paths, which are all inside the
+ framework’s Frameworks directory.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ - Removed references to WRAPPER_NAME from the “Copy XPC services for engineering builds”
+ build phase in the All target, becase WRAPPER_NAME is empty in an aggregate target.
+ - Removed the PlugInProcess target’s dependency on the PluginProcessShim target and its
+ Copy Plug-in Process Shim build phase.
+ - Removed the NetworkProcess target’s dependency on the SecItemShim target and its Copy
+ Sec Item Shim build phase.
+ - Removed the WebProcess target’s dependency on the WebProcessShim target and its Copy
+ WebProcessShim build phase.
+ - Made the WebKit target depend on the shim targets, and added to it a Copy Shims build
+ phase that copies the shims into the framework’s Frameworks directory.
+
+2015-12-13 Dan Bernstein <[email protected]>
+
Build fix.
* Configurations/PluginProcess.xcconfig:
Modified: trunk/Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig (194021 => 194022)
--- trunk/Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig 2015-12-14 03:19:47 UTC (rev 194022)
@@ -31,9 +31,7 @@
APP_ICON_Production = ;
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION));
-EXCLUDED_SOURCE_FILE_NAMES_Production = $(EXCLUDED_SHIM_FILE_NAME) WebKit.icns;
-EXCLUDED_SOURCE_FILE_NAMES_Debug = $(EXCLUDED_SHIM_FILE_NAME);
-EXCLUDED_SOURCE_FILE_NAMES_Release = $(EXCLUDED_SHIM_FILE_NAME);
+EXCLUDED_SOURCE_FILE_NAMES_Production = WebKit.icns;
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION)) *.xib;
Modified: trunk/Source/WebKit2/Configurations/NetworkProcess.xcconfig (194021 => 194022)
--- trunk/Source/WebKit2/Configurations/NetworkProcess.xcconfig 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/Configurations/NetworkProcess.xcconfig 2015-12-14 03:19:47 UTC (rev 194022)
@@ -26,6 +26,4 @@
PRODUCT_NAME = NetworkProcess;
INFOPLIST_FILE = NetworkProcess/EntryPoint/mac/LegacyProcess/Info.plist;
-EXCLUDED_SHIM_FILE_NAME[sdk=iphone*] = SecItemShim.dylib;
-
CODE_SIGN_ENTITLEMENTS[sdk=iphone*] = Configurations/Network-iOS.entitlements;
Modified: trunk/Source/WebKit2/Configurations/PluginProcess.xcconfig (194021 => 194022)
--- trunk/Source/WebKit2/Configurations/PluginProcess.xcconfig 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/Configurations/PluginProcess.xcconfig 2015-12-14 03:19:47 UTC (rev 194022)
@@ -32,6 +32,4 @@
LDFLAGS_SHIM_Production[sdk=macosx*] = $(LDFLAGS_SHIM_$(WK_LINK_SHIM));
LDFLAGS_SHIM_YES = $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
-EXCLUDED_SHIM_FILE_NAME[sdk=iphone*] = PluginProcessShim.dylib;
-
SKIP_INSTALL[sdk=iphone*] = YES;
Modified: trunk/Source/WebKit2/Configurations/PluginProcessShim.xcconfig (194021 => 194022)
--- trunk/Source/WebKit2/Configurations/PluginProcessShim.xcconfig 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/Configurations/PluginProcessShim.xcconfig 2015-12-14 03:19:47 UTC (rev 194022)
@@ -25,8 +25,5 @@
#include "Shim.xcconfig"
-INSTALL_PATH = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/PluginProcess.app/Contents/MacOS;
-DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/PluginProcess.app/Contents/MacOS;
-
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM);
OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit -framework Carbon -framework QuartzCore;
Modified: trunk/Source/WebKit2/Configurations/SecItemShim.xcconfig (194021 => 194022)
--- trunk/Source/WebKit2/Configurations/SecItemShim.xcconfig 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/Configurations/SecItemShim.xcconfig 2015-12-14 03:19:47 UTC (rev 194022)
@@ -25,8 +25,5 @@
#include "Shim.xcconfig"
-INSTALL_PATH[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/NetworkProcess.app/Contents/MacOS;
-DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(NORMAL_WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/NetworkProcess.app/Contents/MacOS;
-
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM);
OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework Security;
Modified: trunk/Source/WebKit2/Configurations/Shim.xcconfig (194021 => 194022)
--- trunk/Source/WebKit2/Configurations/Shim.xcconfig 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/Configurations/Shim.xcconfig 2015-12-14 03:19:47 UTC (rev 194022)
@@ -25,4 +25,7 @@
GCC_DYNAMIC_NO_PIC = NO;
SKIP_INSTALL = YES;
+SKIP_INSTALL[sdk=macosx*] = NO;
+INSTALL_PATH = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
+DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
Modified: trunk/Source/WebKit2/Configurations/WebContentProcess.xcconfig (194021 => 194022)
--- trunk/Source/WebKit2/Configurations/WebContentProcess.xcconfig 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/Configurations/WebContentProcess.xcconfig 2015-12-14 03:19:47 UTC (rev 194022)
@@ -26,6 +26,4 @@
PRODUCT_NAME = WebProcess;
INFOPLIST_FILE = WebProcess/EntryPoint/mac/LegacyProcess/Info.plist;
-EXCLUDED_SHIM_FILE_NAME[sdk=iphone*] = WebProcessShim.dylib;
-
CODE_SIGN_ENTITLEMENTS[sdk=iphonesimulator*] = Configurations/WebContent-iOS.entitlements;
Modified: trunk/Source/WebKit2/Configurations/WebKit.xcconfig (194021 => 194022)
--- trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2015-12-14 03:19:47 UTC (rev 194022)
@@ -48,7 +48,7 @@
SECTORDER_FLAGS_Production[sdk=iphoneos*] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKit.order;
SECTORDER_FLAGS_Production[sdk=macosx*] = -Wl,-order_file,mac/WebKit2.order;
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.pdf Resources/mac/* com.apple.WebKit.Databases.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb PlugInSandboxProfiles/*.sb;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = PlugInProcessShim.dylib SecItemShim.dylib WebProcessShim.dylib *.pdf Resources/mac/* com.apple.WebKit.Databases.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb PlugInSandboxProfiles/*.sb;
INSTALLHDRS_SCRIPT_PHASE = YES;
Modified: trunk/Source/WebKit2/Configurations/WebProcessShim.xcconfig (194021 => 194022)
--- trunk/Source/WebKit2/Configurations/WebProcessShim.xcconfig 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/Configurations/WebProcessShim.xcconfig 2015-12-14 03:19:47 UTC (rev 194022)
@@ -25,8 +25,5 @@
#include "Shim.xcconfig"
-INSTALL_PATH = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/WebProcess.app/Contents/MacOS;
-DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/WebProcess.app/Contents/MacOS;
-
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM);
OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework CoreServices -framework Security;
Modified: trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist (194021 => 194022)
--- trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist 2015-12-14 03:19:47 UTC (rev 194022)
@@ -43,7 +43,7 @@
<key>EnvironmentVariables</key>
<dict>
<key>DYLD_INSERT_LIBRARIES</key>
- <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/NetworkProcess.app/Contents/MacOS/SecItemShim.dylib</string>
+ <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Frameworks/SecItemShim.dylib</string>
</dict>
</dict>
</dict>
Modified: trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist (194021 => 194022)
--- trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist 2015-12-14 03:19:47 UTC (rev 194022)
@@ -49,7 +49,7 @@
<key>EnvironmentVariables</key>
<dict>
<key>DYLD_INSERT_LIBRARIES</key>
- <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/PluginProcess.app/Contents/MacOS/PluginProcessShim.dylib</string>
+ <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Frameworks/PluginProcessShim.dylib</string>
<key>NSStringDisableTagged</key>
<string>YES</string>
</dict>
Modified: trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (194021 => 194022)
--- trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2015-12-14 03:19:47 UTC (rev 194022)
@@ -97,28 +97,16 @@
static RetainPtr<NSString> computeProcessShimPath(const ProcessLauncher::LaunchOptions& launchOptions, NSBundle *webKitBundle)
{
#if ENABLE(NETSCAPE_PLUGIN_API)
- if (launchOptions.processType == ProcessLauncher::PluginProcess) {
- NSString *processPath = [webKitBundle pathForAuxiliaryExecutable:@"PluginProcess.app"];
- NSString *processAppExecutablePath = [[NSBundle bundleWithPath:processPath] executablePath];
-
- return [[processAppExecutablePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"PluginProcessShim.dylib"];
- }
+ if (launchOptions.processType == ProcessLauncher::PluginProcess)
+ return [[webKitBundle privateFrameworksPath] stringByAppendingPathComponent:@"PluginProcessShim.dylib"];
#endif
- if (launchOptions.processType == ProcessLauncher::NetworkProcess) {
- NSString *processPath = [webKitBundle pathForAuxiliaryExecutable:@"NetworkProcess.app"];
- NSString *processAppExecutablePath = [[NSBundle bundleWithPath:processPath] executablePath];
+ if (launchOptions.processType == ProcessLauncher::NetworkProcess)
+ return [[webKitBundle privateFrameworksPath] stringByAppendingPathComponent:@"SecItemShim.dylib"];
- return [[processAppExecutablePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"SecItemShim.dylib"];
- }
+ if (launchOptions.processType == ProcessLauncher::WebProcess)
+ return [[webKitBundle privateFrameworksPath] stringByAppendingPathComponent:@"WebProcessShim.dylib"];
- if (launchOptions.processType == ProcessLauncher::WebProcess) {
- NSString *processPath = [webKitBundle pathForAuxiliaryExecutable:@"WebProcess.app"];
- NSString *processAppExecutablePath = [[NSBundle bundleWithPath:processPath] executablePath];
-
- return [[processAppExecutablePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"WebProcessShim.dylib"];
- }
-
return nil;
}
#endif
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (194021 => 194022)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-12-14 03:19:47 UTC (rev 194022)
@@ -828,6 +828,9 @@
37A5E01418BBF93F000A081E /* _WKActivatedElementInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
37A64E5518F38E3C00EB30F1 /* _WKInputDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 37A64E5418F38E3C00EB30F1 /* _WKInputDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
37A64E5718F38F4600EB30F1 /* _WKFormInputSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 37A64E5618F38F4600EB30F1 /* _WKFormInputSession.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 37B0D1841C1E499A00D40D64 /* PluginProcessShim.dylib in Copy Shims */ = {isa = PBXBuildFile; fileRef = 1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */; };
+ 37B0D1851C1E499A00D40D64 /* SecItemShim.dylib in Copy Shims */ = {isa = PBXBuildFile; fileRef = 510031F61379CACB00C8DFE4 /* SecItemShim.dylib */; };
+ 37B0D1861C1E499A00D40D64 /* WebProcessShim.dylib in Copy Shims */ = {isa = PBXBuildFile; fileRef = CDC3830617211799008A2FC3 /* WebProcessShim.dylib */; };
37B5045219EEF31300CE2CF8 /* WKErrorPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 37B5045119EEF31300CE2CF8 /* WKErrorPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1C79A100E7FC50078DEBC /* WebCore.framework */; };
37BEC4E019491486008B4286 /* CompletionHandlerCallChecker.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37BEC4DE19491486008B4286 /* CompletionHandlerCallChecker.mm */; };
@@ -1618,7 +1621,6 @@
BCDDB32D124EC2E10048D13C /* WKAPICast.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDDB32C124EC2E10048D13C /* WKAPICast.h */; };
BCDE059B11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCDE059911CDA8AE00E41AF1 /* WebContextInjectedBundleClient.h */; };
BCDE059C11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCDE059A11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.cpp */; };
- BCDE093D13272496001259FB /* PluginProcessShim.dylib in Copy Plug-in Process Shim */ = {isa = PBXBuildFile; fileRef = 1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */; };
BCDE0ABF13272708001259FB /* PluginProcess.app in Copy Files */ = {isa = PBXBuildFile; fileRef = BCDE094213272496001259FB /* PluginProcess.app */; };
BCE0937714FB128C001138D9 /* LayerHostingContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCE0937514FB128B001138D9 /* LayerHostingContext.mm */; };
BCE0937814FB128C001138D9 /* LayerHostingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE0937614FB128B001138D9 /* LayerHostingContext.h */; };
@@ -1727,7 +1729,6 @@
CDA041F41ACE2105004A13EC /* BackBoardServicesSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CDA041F31ACE2105004A13EC /* BackBoardServicesSPI.h */; };
CDC382FE17211799008A2FC3 /* SecItemShimLibrary.mm in Sources */ = {isa = PBXBuildFile; fileRef = 511F8A78138B460900A95F44 /* SecItemShimLibrary.mm */; };
CDC38307172117DD008A2FC3 /* CookieStorageShimLibrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDC382F9172116D3008A2FC3 /* CookieStorageShimLibrary.cpp */; };
- CDC3830817211890008A2FC3 /* WebProcessShim.dylib in Copy WebProcessShim */ = {isa = PBXBuildFile; fileRef = CDC3830617211799008A2FC3 /* WebProcessShim.dylib */; };
CDC3830C17212282008A2FC3 /* CookieStorageShimLibrary.h in Headers */ = {isa = PBXBuildFile; fileRef = CDC3830B172121CE008A2FC3 /* CookieStorageShimLibrary.h */; };
CDC3831017212440008A2FC3 /* CookieStorageShim.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDC3830D1721242D008A2FC3 /* CookieStorageShim.mm */; };
CDCA85C8132ABA4E00E961DF /* WKFullScreenWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDCA85C6132ABA4E00E961DF /* WKFullScreenWindowController.mm */; };
@@ -1765,7 +1766,6 @@
E179088F169BAA6A006904C7 /* SecItemShim.h in Headers */ = {isa = PBXBuildFile; fileRef = E18E6948169B77C8009B6670 /* SecItemShim.h */; };
E1790890169BAA7F006904C7 /* SecItemShimMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E18E6911169B667B009B6670 /* SecItemShimMessageReceiver.cpp */; };
E1790891169BAA82006904C7 /* SecItemShimMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = E18E6912169B667B009B6670 /* SecItemShimMessages.h */; };
- E1790901169BB4F9006904C7 /* SecItemShim.dylib in Copy Sec Item Shim */ = {isa = PBXBuildFile; fileRef = 510031F61379CACB00C8DFE4 /* SecItemShim.dylib */; };
E1798C7916E6818800240139 /* NetworkBlobRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1798C7716E6818800240139 /* NetworkBlobRegistry.cpp */; };
E1798C7A16E6818800240139 /* NetworkBlobRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = E1798C7816E6818800240139 /* NetworkBlobRegistry.h */; };
E179FD9C134D38060015B883 /* ArgumentCodersMac.h in Headers */ = {isa = PBXBuildFile; fileRef = E179FD9B134D38060015B883 /* ArgumentCodersMac.h */; };
@@ -1924,6 +1924,27 @@
remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
remoteInfo = WebKit;
};
+ 37B1D0131C1E421100D67FE9 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 1AC25FAF12A48EA700BD2671;
+ remoteInfo = PluginProcessShim;
+ };
+ 37B1D0151C1E421100D67FE9 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 510031EA1379CACB00C8DFE4;
+ remoteInfo = SecItemShim;
+ };
+ 37B1D0171C1E421100D67FE9 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = CDC382FB17211799008A2FC3;
+ remoteInfo = WebProcessShim;
+ };
37F7407812721F740093869B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
@@ -2022,13 +2043,6 @@
remoteGlobalIDString = BCAE9DE8160C097400A33217;
remoteInfo = WebProcessServiceForWebKitDevelopment;
};
- BCDE093513272496001259FB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 1AC25FAF12A48EA700BD2671;
- remoteInfo = PluginProcessShim;
- };
BCDE093713272496001259FB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
@@ -2043,20 +2057,6 @@
remoteGlobalIDString = BCDE093313272496001259FB;
remoteInfo = "Plugin Process";
};
- CDC3830917211ABE008A2FC3 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = CDC382FB17211799008A2FC3;
- remoteInfo = WebProcessShim;
- };
- CDC8F4D41725F73F00166F6E /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 510031EA1379CACB00C8DFE4;
- remoteInfo = SecItemShim;
- };
E1B1B18E1A7AC1F5007B0965 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
@@ -2102,15 +2102,17 @@
name = "Copy Files";
runOnlyForDeploymentPostprocessing = 0;
};
- 5183B38F1379F56800E8754E /* Copy WebProcessShim */ = {
+ 372589431C1E496800C92CA9 /* Copy Shims */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
- dstPath = WebProcess.app/Contents/MacOS;
- dstSubfolderSpec = 16;
+ dstPath = "";
+ dstSubfolderSpec = 10;
files = (
- CDC3830817211890008A2FC3 /* WebProcessShim.dylib in Copy WebProcessShim */,
+ 37B0D1841C1E499A00D40D64 /* PluginProcessShim.dylib in Copy Shims */,
+ 37B0D1851C1E499A00D40D64 /* SecItemShim.dylib in Copy Shims */,
+ 37B0D1861C1E499A00D40D64 /* WebProcessShim.dylib in Copy Shims */,
);
- name = "Copy WebProcessShim";
+ name = "Copy Shims";
runOnlyForDeploymentPostprocessing = 0;
};
7CB16FEE1724BA05007A0A95 /* Copy Plug-in Sandbox Profiles */ = {
@@ -2142,28 +2144,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- BCDE093C13272496001259FB /* Copy Plug-in Process Shim */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = PluginProcess.app/Contents/MacOS;
- dstSubfolderSpec = 16;
- files = (
- BCDE093D13272496001259FB /* PluginProcessShim.dylib in Copy Plug-in Process Shim */,
- );
- name = "Copy Plug-in Process Shim";
- runOnlyForDeploymentPostprocessing = 0;
- };
- E1790900169BB4D3006904C7 /* Copy Sec Item Shim */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = NetworkProcess.app/Contents/MacOS;
- dstSubfolderSpec = 16;
- files = (
- E1790901169BB4F9006904C7 /* SecItemShim.dylib in Copy Sec Item Shim */,
- );
- name = "Copy Sec Item Shim";
- runOnlyForDeploymentPostprocessing = 0;
- };
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
@@ -8533,13 +8513,11 @@
buildPhases = (
1A50DB1A110A3BDC000D3FE5 /* Resources */,
1A50DB1B110A3BDC000D3FE5 /* Sources */,
- 5183B38F1379F56800E8754E /* Copy WebProcessShim */,
BC5D24B016CC3F28007D5461 /* Frameworks */,
);
buildRules = (
);
dependencies = (
- CDC3830A17211ABE008A2FC3 /* PBXTargetDependency */,
1A50DB27110A3BEF000D3FE5 /* PBXTargetDependency */,
);
name = WebProcess;
@@ -8587,13 +8565,11 @@
buildPhases = (
510CC80A1613C79900D03ED3 /* Sources */,
510CC80C1613C79900D03ED3 /* Resources */,
- E1790900169BB4D3006904C7 /* Copy Sec Item Shim */,
BC5D24B416CC3F43007D5461 /* Frameworks */,
);
buildRules = (
);
dependencies = (
- CDC8F4D51725F73F00166F6E /* PBXTargetDependency */,
510CC8511613C98D00D03ED3 /* PBXTargetDependency */,
);
name = NetworkProcess;
@@ -8667,6 +8643,7 @@
1AD98ECF191D867300CAA6DF /* Postprocess WKFoundation.h */,
1A1D2115191D96380001619F /* Postprocess Framework Headers */,
8DC2EF520486A6940098B216 /* Resources */,
+ 372589431C1E496800C92CA9 /* Copy Shims */,
7CB16FEE1724BA05007A0A95 /* Copy Plug-in Sandbox Profiles */,
37E531011B2391090074F0DF /* Copy iOS Sandbox Profiles for Manual Sandboxing */,
1A07D2F71919B36500ECDA16 /* Copy Message Generation Scripts */,
@@ -8683,6 +8660,9 @@
);
dependencies = (
37F7407912721F740093869B /* PBXTargetDependency */,
+ 37B1D0141C1E421100D67FE9 /* PBXTargetDependency */,
+ 37B1D0161C1E421100D67FE9 /* PBXTargetDependency */,
+ 37B1D0181C1E421100D67FE9 /* PBXTargetDependency */,
);
name = WebKit;
productInstallPath = "$(HOME)/Library/Frameworks";
@@ -8824,13 +8804,11 @@
buildPhases = (
BCDE093813272496001259FB /* Resources */,
BCDE093A13272496001259FB /* Sources */,
- BCDE093C13272496001259FB /* Copy Plug-in Process Shim */,
BC5D24B216CC3F3B007D5461 /* Frameworks */,
);
buildRules = (
);
dependencies = (
- BCDE093413272496001259FB /* PBXTargetDependency */,
BCDE093613272496001259FB /* PBXTargetDependency */,
);
name = PluginProcess;
@@ -9293,20 +9271,20 @@
);
name = "Copy XPC services for engineering builds";
outputPaths = (
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.WebContent.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.WebContent.Development.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Networking.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Networking.Development.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.32.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.64.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.32.Development.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.64.Development.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Databases.xpc",
- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Databases.Development.xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.WebContent.xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.WebContent.Development.xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Networking.xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Networking.Development.xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.32.xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.64.xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.32.Development.xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.64.Development.xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Databases.xpc",
+ "$(BUILT_PRODUCTS_DIR)/WebKit.framework/XPCServices/com.apple.WebKit.Databases.Development.xpc",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nif [[ ${PLATFORM_NAME} != \"macosx\" ]]; then\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit.framework/XPCServices\"\nelse\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit.framework/Versions/A/XPCServices\"\nfi\n\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.Development.xpc\&
quot; \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.Development.xpc\"\n\nif [[ ${PLATFORM_NAME} == macosx ]]; then\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32.Development.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.Development.xpc\" \"${
XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.Development.xpc\"\nfi\n";
+ shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nif [[ ${PLATFORM_NAME} != \"macosx\" ]]; then\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/XPCServices\"\nelse\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/Versions/A/XPCServices\"\nfi\n\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.Development.xpc\" \"${XPC_SERVICES_PATH}
/com.apple.WebKit.Networking.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.Development.xpc\"\n\nif [[ ${PLATFORM_NAME} == macosx ]]; then\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32.Development.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebK
it.Plugin.64.Development.xpc\"\nfi\n";
};
C0CE72841247E66800BC0EC4 /* Generate Derived Sources */ = {
isa = PBXShellScriptBuildPhase;
@@ -10356,6 +10334,21 @@
target = 8DC2EF4F0486A6940098B216 /* WebKit */;
targetProxy = 375E063E191EAA33004E3CAF /* PBXContainerItemProxy */;
};
+ 37B1D0141C1E421100D67FE9 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 1AC25FAF12A48EA700BD2671 /* PluginProcessShim */;
+ targetProxy = 37B1D0131C1E421100D67FE9 /* PBXContainerItemProxy */;
+ };
+ 37B1D0161C1E421100D67FE9 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 510031EA1379CACB00C8DFE4 /* SecItemShim */;
+ targetProxy = 37B1D0151C1E421100D67FE9 /* PBXContainerItemProxy */;
+ };
+ 37B1D0181C1E421100D67FE9 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = CDC382FB17211799008A2FC3 /* WebProcessShim */;
+ targetProxy = 37B1D0171C1E421100D67FE9 /* PBXContainerItemProxy */;
+ };
37F7407912721F740093869B /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = C0CE72851247E66800BC0EC4 /* Derived Sources */;
@@ -10426,11 +10419,6 @@
target = BCAE9DE8160C097400A33217 /* WebContent.Development */;
targetProxy = BCAE9DFC160C0AB000A33217 /* PBXContainerItemProxy */;
};
- BCDE093413272496001259FB /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 1AC25FAF12A48EA700BD2671 /* PluginProcessShim */;
- targetProxy = BCDE093513272496001259FB /* PBXContainerItemProxy */;
- };
BCDE093613272496001259FB /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 8DC2EF4F0486A6940098B216 /* WebKit */;
@@ -10441,16 +10429,6 @@
target = BCDE093313272496001259FB /* PluginProcess */;
targetProxy = BCDE0AC013272712001259FB /* PBXContainerItemProxy */;
};
- CDC3830A17211ABE008A2FC3 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = CDC382FB17211799008A2FC3 /* WebProcessShim */;
- targetProxy = CDC3830917211ABE008A2FC3 /* PBXContainerItemProxy */;
- };
- CDC8F4D51725F73F00166F6E /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 510031EA1379CACB00C8DFE4 /* SecItemShim */;
- targetProxy = CDC8F4D41725F73F00166F6E /* PBXContainerItemProxy */;
- };
E1B1B18D1A7AC1F5007B0965 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 8DC2EF4F0486A6940098B216 /* WebKit */;
Modified: trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist (194021 => 194022)
--- trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist 2015-12-14 02:52:51 UTC (rev 194021)
+++ trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist 2015-12-14 03:19:47 UTC (rev 194022)
@@ -49,7 +49,7 @@
<key>EnvironmentVariables</key>
<dict>
<key>DYLD_INSERT_LIBRARIES</key>
- <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/WebProcess.app/Contents/MacOS/WebProcessShim.dylib</string>
+ <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Frameworks/WebProcessShim.dylib</string>
</dict>
</dict>
</dict>
