Changeset 184215 in webkit


Ignore:
Timestamp:
May 12, 2015, 1:46:34 PM (10 years ago)
Author:
andersca@apple.com
Message:

Production builds should link against the shims directly
​https://bugs.webkit.org/show_bug.cgi?id=144922
rdar://problem/19708579

Reviewed by Dan Bernstein.

  • Configurations/NetworkService.xcconfig:

Point to an Info.plist that has DYLD_INSERT_LIBRARIES set on 10.10 and earlier.
Link directly against SecItemShim.dylib where possible.

  • Configurations/PluginProcessShim.xcconfig:

Set the install name and install path.

  • Configurations/PluginService.32.xcconfig:

Point to an Info.plist that has DYLD_INSERT_LIBRARIES set on 10.10 and earlier.
Link directly against PluginProcessShim.dylib where possible.

  • Configurations/PluginService.64.xcconfig:

Point to an Info.plist that has DYLD_INSERT_LIBRARIES set on 10.10 and earlier.
Link directly against PluginProcessShim.dylib where possible.

  • Configurations/SecItemShim.xcconfig:

Set the install name and install path.

  • Configurations/WebContentService.xcconfig:

Point to an Info.plist that has DYLD_INSERT_LIBRARIES set on 10.10 and earlier.
Link directly against WebProcessShim.dylib where possible.

  • Configurations/WebProcessShim.xcconfig:

Set the install name and install path.

  • NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist: Copied from Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist.
  • NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist:

Add an Info.plist for 10.9 and 10.10 and remove DYLD_INSERT_LIBRARIES from the non-legacy plist.

  • PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist: Copied from Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist.
  • PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist:

Add an Info.plist for 10.9 and 10.10 and remove DYLD_INSERT_LIBRARIES from the non-legacy plist.

  • WebKit2.xcodeproj/project.pbxproj:

Add new files.

  • WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist: Copied from Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist.
  • WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist:

Add an Info.plist for 10.9 and 10.10 and remove DYLD_INSERT_LIBRARIES from the non-legacy plist.

Location:
trunk/Source/WebKit2
Files:
12 edited
3 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r184212 r184215  
     12015-05-12  Anders Carlsson  <andersca@apple.com>
     2
     3        Production builds should link against the shims directly
     4        https://bugs.webkit.org/show_bug.cgi?id=144922
     5        rdar://problem/19708579
     6
     7        Reviewed by Dan Bernstein.
     8
     9        * Configurations/NetworkService.xcconfig:
     10        Point to an Info.plist that has DYLD_INSERT_LIBRARIES set on 10.10 and earlier.
     11        Link directly against SecItemShim.dylib where possible.
     12
     13        * Configurations/PluginProcessShim.xcconfig:
     14        Set the install name and install path.
     15
     16        * Configurations/PluginService.32.xcconfig:
     17        Point to an Info.plist that has DYLD_INSERT_LIBRARIES set on 10.10 and earlier.
     18        Link directly against PluginProcessShim.dylib where possible.
     19
     20        * Configurations/PluginService.64.xcconfig:
     21        Point to an Info.plist that has DYLD_INSERT_LIBRARIES set on 10.10 and earlier.
     22        Link directly against PluginProcessShim.dylib where possible.
     23
     24        * Configurations/SecItemShim.xcconfig:
     25        Set the install name and install path.
     26
     27        * Configurations/WebContentService.xcconfig:
     28        Point to an Info.plist that has DYLD_INSERT_LIBRARIES set on 10.10 and earlier.
     29        Link directly against WebProcessShim.dylib where possible.
     30
     31        * Configurations/WebProcessShim.xcconfig:
     32        Set the install name and install path.
     33
     34        * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist: Copied from Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist.
     35        * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist:
     36        Add an Info.plist for 10.9 and 10.10 and remove DYLD_INSERT_LIBRARIES from the non-legacy plist.
     37
     38        * PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist: Copied from Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist.
     39        * PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist:
     40        Add an Info.plist for 10.9 and 10.10 and remove DYLD_INSERT_LIBRARIES from the non-legacy plist.
     41
     42        * WebKit2.xcodeproj/project.pbxproj:
     43        Add new files.
     44
     45        * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist: Copied from Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist.
     46        * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist:
     47        Add an Info.plist for 10.9 and 10.10 and remove DYLD_INSERT_LIBRARIES from the non-legacy plist.
     48
    1492015-05-12  Alexey Proskuryakov  <ap@apple.com>
    250

  • trunk/Source/WebKit2/Configurations/NetworkService.xcconfig

    r177621 r184215  
    2929INFOPLIST_FILE[sdk=iphone*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist;
    3030INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist;
     31INFOPLIST_FILE[sdk=macosx10.9*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist;
     32INFOPLIST_FILE[sdk=macosx10.10*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist;
    3133
    3234CODE_SIGN_ENTITLEMENTS[sdk=iphone*] = Configurations/Network-iOS.entitlements;
     35
     36OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM);
     37OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/SecItemShim.dylib;
     38OTHER_LDFLAGS_PLATFORM[sdk=macosx10.9*] = ;
     39OTHER_LDFLAGS_PLATFORM[sdk=macosx10.10*] = ;

  • trunk/Source/WebKit2/Configurations/PluginProcessShim.xcconfig

    r177621 r184215  
    2626#include "Shim.xcconfig"
    2727
     28INSTALL_PATH_ACTUAL = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/PluginProcess.app/Contents/MacOS;
     29DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/PluginProcess.app/Contents/MacOS;
     30
    2831OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM);
    2932OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit -framework Carbon -framework QuartzCore;

  • trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig

    r183360 r184215  
    3232PRODUCT_NAME = com.apple.WebKit.Plugin.32;
    3333INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
     34INFOPLIST_FILE[sdk=macosx10.9*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
     35INFOPLIST_FILE[sdk=macosx10.10] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
    3436
    3537OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
    36 OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
     38OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
     39OTHER_LDFLAGS_PLATFORM[sdk=macosx10.9*] = -framework AppKit;
     40OTHER_LDFLAGS_PLATFORM[sdk=macosx10.10*] = -framework AppKit;
    3741
    3842CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;

  • trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig

    r183360 r184215  
    3232PRODUCT_NAME = com.apple.WebKit.Plugin.64;
    3333INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
     34INFOPLIST_FILE[sdk=macosx10.9*] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
     35INFOPLIST_FILE[sdk=macosx10.10] = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist;
    3436
    3537OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
    36 OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
     38OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/PluginProcessShim.dylib;
     39OTHER_LDFLAGS_PLATFORM[sdk=macosx10.9*] = -framework AppKit;
     40OTHER_LDFLAGS_PLATFORM[sdk=macosx10.10*] = -framework AppKit;
    3741
    3842CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;

  • trunk/Source/WebKit2/Configurations/SecItemShim.xcconfig

    r177621 r184215  
    2626#include "Shim.xcconfig"
    2727
     28INSTALL_PATH_ACTUAL[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/NetworkProcess.app/Contents/MacOS;
     29DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(NORMAL_WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/NetworkProcess.app/Contents/MacOS;
     30
    2831OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM);
    2932OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework Security;

  • trunk/Source/WebKit2/Configurations/WebContentService.xcconfig

    r179450 r184215  
    2929INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
    3030INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist;
     31INFOPLIST_FILE[sdk=macosx10.9*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist;
     32INFOPLIST_FILE[sdk=macosx10.10*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist;
    3133
    3234BUNDLE_LOCALIZATION_KEY[sdk=iphone*] = CFBundleFollowParentLocalization;
    … …  
    3941
    4042OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM);
    41 OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
     43OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit $(BUILT_PRODUCTS_DIR)/WebProcessShim.dylib;
     44OTHER_LDFLAGS_PLATFORM[sdk=macosx10.9*] = -framework AppKit;
     45OTHER_LDFLAGS_PLATFORM[sdk=macosx10.10*] = -framework AppKit;

  • trunk/Source/WebKit2/Configurations/WebProcessShim.xcconfig

    r177621 r184215  
    2626#include "Shim.xcconfig"
    2727
     28INSTALL_PATH_ACTUAL = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/WebProcess.app/Contents/MacOS;
     29DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/WebProcess.app/Contents/MacOS;
     30
    2831OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM);
    2932OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework CoreServices -framework Security;

  • trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist

    r177849 r184215  
    4141                <key>_MultipleInstances</key>
    4242                <true/>
    43                 <key>EnvironmentVariables</key>
    44                 <dict>
    45                         <key>DYLD_INSERT_LIBRARIES</key>
    46                         <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/NetworkProcess.app/Contents/MacOS/SecItemShim.dylib</string>
    47                 </dict>
    4843        </dict>
    4944</dict>

  • trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist

    r177849 r184215  
    4949                <key>EnvironmentVariables</key>
    5050                <dict>
    51                         <key>DYLD_INSERT_LIBRARIES</key>
    52                         <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/PluginProcess.app/Contents/MacOS/PluginProcessShim.dylib</string>
    5351                        <key>NSStringDisableTagged</key>
    5452                        <string>YES</string>

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

    r184043 r184215  
    24202420                1A6509CD18B4146200614332 /* WKProcessPoolPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessPoolPrivate.h; sourceTree = "<group>"; };
    24212421                1A66BF8E18A052ED002071B4 /* WKWebViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebViewInternal.h; sourceTree = "<group>"; };
     2422                1A6D141F1B0167D500785FF0 /* Info-OSX-10.9-10.10.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-OSX-10.9-10.10.plist"; sourceTree = "<group>"; };
     2423                1A6D14211B01681600785FF0 /* PluginService.32-64-10.9-10.10.Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "PluginService.32-64-10.9-10.10.Info.plist"; path = "PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist"; sourceTree = SOURCE_ROOT; };
    24222424                1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommandLine.h; sourceTree = "<group>"; };
    24232425                1A6F9FB611E1408500DB1371 /* CommandLinePOSIX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommandLinePOSIX.cpp; sourceTree = "<group>"; };
    … …  
    24372439                1A7C6CD81378950800B9C04D /* EnvironmentVariables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EnvironmentVariables.cpp; sourceTree = "<group>"; };
    24382440                1A7C6CD91378950800B9C04D /* EnvironmentVariables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EnvironmentVariables.h; sourceTree = "<group>"; };
     2441                1A7DA54D1AFD8B380018239D /* Info-OSX-10.9-10.10.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-OSX-10.9-10.10.plist"; sourceTree = "<group>"; };
    24392442                1A7E377418E4A33A003D0FFF /* WKScriptMessageHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKScriptMessageHandler.h; sourceTree = "<group>"; };
    24402443                1A7E377618E4A4FE003D0FFF /* WKScriptMessage.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKScriptMessage.mm; sourceTree = "<group>"; };
    … …  
    68746877                        children = (
    68756878                                26659AA0185FAAED004303DD /* Info-iOS.plist */,
     6879                                1A6D141F1B0167D500785FF0 /* Info-OSX-10.9-10.10.plist */,
    68766880                                BC8283A316B4BD9100A278FE /* Info-OSX.plist */,
    68776881                        );
    … …  
    69026906                        isa = PBXGroup;
    69036907                        children = (
     6908                                1A6D14211B01681600785FF0 /* PluginService.32-64-10.9-10.10.Info.plist */,
    69046909                                BCFCA89516DE96CB00074069 /* PluginService.32-64.Info.plist */,
    69056910                        );
    … …  
    69967001                        children = (
    69977002                                375FB4731883415600BE34D4 /* Info-iOS.plist */,
     7003                                1A7DA54D1AFD8B380018239D /* Info-OSX-10.9-10.10.plist */,
    69987004                                BCACC44016B24CAA00B6E092 /* Info-OSX.plist */,
    69997005                        );

  • trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist

    r177849 r184215  
    4747                <key>_MultipleInstances</key>
    4848                <true/>
    49                 <key>EnvironmentVariables</key>
    50                 <dict>
    51                         <key>DYLD_INSERT_LIBRARIES</key>
    52                         <string>$(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/WebProcess.app/Contents/MacOS/WebProcessShim.dylib</string>
    53                 </dict>
    5449        </dict>
    5550</dict>
Note: See TracChangeset for help on using the changeset viewer.