Changeset 161918 in webkit


Ignore:
Timestamp:
Jan 13, 2014 4:33:35 PM (10 years ago)
Author:
aestes@apple.com
Message:

[iOS] Exclude shims and PluginProcess.app from the WebKit2 build
​https://bugs.webkit.org/show_bug.cgi?id=126936

Reviewed by Daniel Bates.

  • Configurations/All.xcconfig: Added. Excluded PluginProcess.app from

being copied into WebKit2.framework on iOS.

  • Configurations/NetworkProcess.xcconfig: Excluded SecItemShim.dylib

from being copied into NetworkProcess.app on iOS.

  • Configurations/PluginProcess.xcconfig: Excluded

PluginProcessShim.dylib from being copied into PluginProcess.app and
set SKIP_INSTALL to YES on iOS.

  • Configurations/PluginProcessShim.xcconfig: Added. Linked the shim

against necessary frameworks on Mac.

  • Configurations/SecItemShim.xcconfig: Ditto.
  • Configurations/WebProcessShim.xcconfig: Ditto.
  • Configurations/WebContentProcess.xcconfig: Excluded

WebProcessShim.dylib from being copied into WebProcess.app on iOS.

  • PluginProcess/mac/PluginProcessShim.mm: Added #if !PLATFORM(IOS) guards.
  • Shared/mac/CookieStorageShimLibrary.cpp: Ditto.
  • WebProcess/mac/SecItemShimLibrary.mm: Ditto.
  • WebKit2.xcodeproj/project.pbxproj: Removed Mac-only frameworks from

the shims' 'Link Binary with Libraries' build phases. Added new xcconfigs.

Location:
trunk/Source/WebKit2
Files:
4 added
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r161915 r161918  
     12014-01-13  Andy Estes  <aestes@apple.com>
     2
     3        [iOS] Exclude shims and PluginProcess.app from the WebKit2 build
     4        https://bugs.webkit.org/show_bug.cgi?id=126936
     5
     6        Reviewed by Daniel Bates.
     7
     8        * Configurations/All.xcconfig: Added. Excluded PluginProcess.app from
     9        being copied into WebKit2.framework on iOS.
     10        * Configurations/NetworkProcess.xcconfig: Excluded SecItemShim.dylib
     11        from being copied into NetworkProcess.app on iOS.
     12        * Configurations/PluginProcess.xcconfig: Excluded
     13        PluginProcessShim.dylib from being copied into PluginProcess.app and
     14        set SKIP_INSTALL to YES on iOS.
     15        * Configurations/PluginProcessShim.xcconfig: Added. Linked the shim
     16        against necessary frameworks on Mac.
     17        * Configurations/SecItemShim.xcconfig: Ditto.
     18        * Configurations/WebProcessShim.xcconfig: Ditto.
     19        * Configurations/WebContentProcess.xcconfig: Excluded
     20        WebProcessShim.dylib from being copied into WebProcess.app on iOS.
     21        * PluginProcess/mac/PluginProcessShim.mm: Added #if !PLATFORM(IOS) guards.
     22        * Shared/mac/CookieStorageShimLibrary.cpp: Ditto.
     23        * WebProcess/mac/SecItemShimLibrary.mm: Ditto.
     24        * WebKit2.xcodeproj/project.pbxproj: Removed Mac-only frameworks from
     25        the shims' 'Link Binary with Libraries' build phases. Added new xcconfigs.
     26
    1272014-01-13  Jinwoo Song  <jinwoo7.song@samsung.com>
    228

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

    r142806 r161918  
    2626PRODUCT_NAME = NetworkProcess;
    2727INFOPLIST_FILE = NetworkProcess/EntryPoint/mac/LegacyProcess/Info.plist;
     28
     29EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAME_$(PLATFORM_NAME));
     30EXCLUDED_SOURCE_FILE_NAMES_iphoneos = SecItemShim.dylib;
     31EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);

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

    r143544 r161918  
    2727INFOPLIST_FILE = PluginProcess/EntryPoint/mac/LegacyProcess/Info.plist;
    2828CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
     29
     30EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAME_$(PLATFORM_NAME));
     31EXCLUDED_SOURCE_FILE_NAMES_iphoneos = PluginProcessShim.dylib;
     32EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
     33
     34SKIP_INSTALL = $(SKIP_INSTALL_$(PLATFORM_NAME));
     35SKIP_INSTALL_macosx = $(inherited);
     36SKIP_INSTALL_iphoneos = YES;
     37SKIP_INSTALL_iphonesimulator = $(SKIP_INSTALL_iphoneos);

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

    r157987 r161918  
    3434OTHER_LDFLAGS_iphoneos = ;
    3535OTHER_LDFLAGS_iphonesimulator = ;
     36
     37EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAME_$(PLATFORM_NAME));
     38EXCLUDED_SOURCE_FILE_NAMES_iphoneos = WebProcessShim.dylib;
     39EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);

  • trunk/Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm

    r159437 r161918  
    2424 */
    2525
     26#if !PLATFORM(IOS)
     27
    2628#import <wtf/Platform.h>
    2729#import "PluginProcessShim.h"
    … …  
    329331} // namespace WebKit
    330332
     333#endif // !PLATFORM(IOS)

  • trunk/Source/WebKit2/Shared/mac/CookieStorageShimLibrary.cpp

    r150089 r161918  
    2727#include "CookieStorageShimLibrary.h"
    2828
    29 #if ENABLE(NETWORK_PROCESS)
     29#if ENABLE(NETWORK_PROCESS) && !PLATFORM(IOS)
    3030
    3131#include <WebCore/DynamicLinkerInterposing.h>
    … …  
    9191}
    9292
    93 #endif // ENABLE(NETWORK_PROCESS)
     93#endif // ENABLE(NETWORK_PROCESS) && !PLATFORM(IOS)

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

    r161836 r161918  
    139139                1A334DED16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */; };
    140140                1A334DEE16DE8F88006A8E38 /* StorageAreaMapMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A334DEC16DE8F88006A8E38 /* StorageAreaMapMessages.h */; };
    141                 1A3979F61332983A00E00300 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
    142                 1A3979F71332983F00E00300 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1CC5C100FA1A10078DEBC /* QuartzCore.framework */; };
    143141                1A3D610113A7CC2A00F95D4E /* PluginModuleInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3D60FF13A7CC2A00F95D4E /* PluginModuleInfo.cpp */; };
    144142                1A3D610213A7CC2A00F95D4E /* PluginModuleInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3D610013A7CC2A00F95D4E /* PluginModuleInfo.h */; };
    … …  
    229227                1AA41AB512C02EC4002BE67B /* EditorState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA41AB412C02EC4002BE67B /* EditorState.h */; };
    230228                1AA4792312A59FD9008236C3 /* PluginProcessMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AA4792212A59FD9008236C3 /* PluginProcessMac.mm */; };
    231                 1AA479B012A5A436008236C3 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1CD06100FA1BA0078DEBC /* Carbon.framework */; };
    232229                1AA56F2911E92BC80061B882 /* PluginController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA56F2811E92BC80061B882 /* PluginController.h */; };
    233230                1AA575FA1496B52600A4EE06 /* EventDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AA575F81496B52600A4EE06 /* EventDispatcher.cpp */; };
    … …  
    701698                51D0D436183B353D0097041D /* DatabaseProcessIDBConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51D0D434183B353D0097041D /* DatabaseProcessIDBConnectionMessageReceiver.cpp */; };
    702699                51D0D437183B353D0097041D /* DatabaseProcessIDBConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D0D435183B353D0097041D /* DatabaseProcessIDBConnectionMessages.h */; };
    703                 51D1304E1382E5B700351EDD /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF5068412431861005955AE /* Security.framework */; };
    704700                51D130531382EAC000351EDD /* SecItemRequestData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51D1304F1382EAC000351EDD /* SecItemRequestData.cpp */; };
    705701                51D130541382EAC000351EDD /* SecItemRequestData.h in Headers */ = {isa = PBXBuildFile; fileRef = 51D130501382EAC000351EDD /* SecItemRequestData.h */; };
    … …  
    12831279                CD73BA53131B645B00EEDED2 /* WebFullScreenManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD73BA37131A29FE00EEDED2 /* WebFullScreenManager.cpp */; };
    12841280                CDC382FE17211799008A2FC3 /* SecItemShimLibrary.mm in Sources */ = {isa = PBXBuildFile; fileRef = 511F8A78138B460900A95F44 /* SecItemShimLibrary.mm */; };
    1285                 CDC3830117211799008A2FC3 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF5068412431861005955AE /* Security.framework */; };
    12861281                CDC38307172117DD008A2FC3 /* CookieStorageShimLibrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDC382F9172116D3008A2FC3 /* CookieStorageShimLibrary.cpp */; };
    12871282                CDC3830817211890008A2FC3 /* WebProcessShim.dylib in Copy WebProcessShim */ = {isa = PBXBuildFile; fileRef = CDC3830617211799008A2FC3 /* WebProcessShim.dylib */; };
    … …  
    12901285                CDCA85C8132ABA4E00E961DF /* WKFullScreenWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDCA85C6132ABA4E00E961DF /* WKFullScreenWindowController.mm */; };
    12911286                CDCA85C9132ABA4E00E961DF /* WKFullScreenWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = CDCA85C7132ABA4E00E961DF /* WKFullScreenWindowController.h */; };
    1292                 CDDF622F1728A20D001EC01F /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCD0042C110C1E27003B8A67 /* CoreServices.framework */; };
    12931287                CEDA12E2152CD1AE00D9E08D /* WebAlternativeTextClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEDA12DF152CCAE800D9E08D /* WebAlternativeTextClient.cpp */; };
    12941288                CEDA12E3152CD1B300D9E08D /* WebAlternativeTextClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CEDA12DE152CCAE800D9E08D /* WebAlternativeTextClient.h */; };
    … …  
    24752469                9FB5F392169E6A80002C25BF /* WKContextPrivateMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKContextPrivateMac.mm; path = mac/WKContextPrivateMac.mm; sourceTree = "<group>"; };
    24762470                9FB5F393169E6A80002C25BF /* WKContextPrivateMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKContextPrivateMac.h; path = mac/WKContextPrivateMac.h; sourceTree = "<group>"; };
     2471                A1EDD2D91884ACE000BBFE98 /* All.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = All.xcconfig; sourceTree = "<group>"; };
     2472                A1EDD2DB1884B96400BBFE98 /* PluginProcessShim.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = PluginProcessShim.xcconfig; sourceTree = "<group>"; };
     2473                A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = SecItemShim.xcconfig; sourceTree = "<group>"; };
     2474                A1EDD2DD1884B9E300BBFE98 /* WebProcessShim.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebProcessShim.xcconfig; sourceTree = "<group>"; };
    24772475                A5EFD38B16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageVisibilityTypes.h; sourceTree = "<group>"; };
    24782476                A72D5D7F1236CBA800A88B15 /* WebSerializedScriptValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSerializedScriptValue.h; sourceTree = "<group>"; };
    … …  
    30643062                        buildActionMask = 2147483647;
    30653063                        files = (
    3066                                 1A3979F61332983A00E00300 /* AppKit.framework in Frameworks */,
    3067                                 1AA479B012A5A436008236C3 /* Carbon.framework in Frameworks */,
    3068                                 1A3979F71332983F00E00300 /* QuartzCore.framework in Frameworks */,
    30693064                        );
    30703065                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    30743069                        buildActionMask = 2147483647;
    30753070                        files = (
    3076                                 51D1304E1382E5B700351EDD /* Security.framework in Frameworks */,
    30773071                        );
    30783072                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    31963190                        buildActionMask = 2147483647;
    31973191                        files = (
    3198                                 CDDF622F1728A20D001EC01F /* CoreServices.framework in Frameworks */,
    3199                                 CDC3830117211799008A2FC3 /* Security.framework in Frameworks */,
    32003192                        );
    32013193                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    34103402                        isa = PBXGroup;
    34113403                        children = (
     3404                                A1EDD2D91884ACE000BBFE98 /* All.xcconfig */,
    34123405                                1A4F976A100E7B6600637A18 /* Base.xcconfig */,
    34133406                                BC5D24B816CC40BB007D5461 /* BaseLegacyProcess.xcconfig */,
    … …  
    34233416                                BC8283AB16B4BEAD00A278FE /* NetworkService.xcconfig */,
    34243417                                BC122FA3132707F300F7EAC1 /* PluginProcess.xcconfig */,
     3418                                A1EDD2DB1884B96400BBFE98 /* PluginProcessShim.xcconfig */,
    34253419                                BC8283F216B4FC5300A278FE /* PluginService.32.xcconfig */,
    34263420                                BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */,
    34273421                                BCBECDC216B5CE2A00047A1A /* PluginService.Development.xcconfig */,
    34283422                                5D442A5516D5856700AC3331 /* PluginService.entitlements */,
     3423                                A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */,
    34293424                                5183B3931379F85C00E8754E /* Shim.xcconfig */,
    34303425                                1A4F976E100E7B6600637A18 /* Version.xcconfig */,
    … …  
    34333428                                BCACC40E16B0B8A800B6E092 /* WebContentService.xcconfig */,
    34343429                                BCB86F4B116AAACD00CE20B7 /* WebKit2.xcconfig */,
     3430                                A1EDD2DD1884B9E300BBFE98 /* WebProcessShim.xcconfig */,
    34353431                        );
    34363432                        path = Configurations;
    … …  
    80058001                1A50DB39110A3C13000D3FE5 /* Debug */ = {
    80068002                        isa = XCBuildConfiguration;
     8003                        baseConfigurationReference = A1EDD2D91884ACE000BBFE98 /* All.xcconfig */;
    80078004                        buildSettings = {
    80088005                                PRODUCT_NAME = All;
    … …  
    80128009                1A50DB3A110A3C13000D3FE5 /* Release */ = {
    80138010                        isa = XCBuildConfiguration;
     8011                        baseConfigurationReference = A1EDD2D91884ACE000BBFE98 /* All.xcconfig */;
    80148012                        buildSettings = {
    80158013                                PRODUCT_NAME = All;
    … …  
    80198017                1AC25FB112A48EA700BD2671 /* Debug */ = {
    80208018                        isa = XCBuildConfiguration;
    8021                         baseConfigurationReference = 5183B3931379F85C00E8754E /* Shim.xcconfig */;
     8019                        baseConfigurationReference = A1EDD2DB1884B96400BBFE98 /* PluginProcessShim.xcconfig */;
    80228020                        buildSettings = {
    80238021                                OTHER_LDFLAGS = (
    … …  
    80318029                1AC25FB212A48EA700BD2671 /* Release */ = {
    80328030                        isa = XCBuildConfiguration;
    8033                         baseConfigurationReference = 5183B3931379F85C00E8754E /* Shim.xcconfig */;
     8031                        baseConfigurationReference = A1EDD2DB1884B96400BBFE98 /* PluginProcessShim.xcconfig */;
    80348032                        buildSettings = {
    80358033                                OTHER_LDFLAGS = (
    … …  
    80438041                1AC25FB312A48EA700BD2671 /* Production */ = {
    80448042                        isa = XCBuildConfiguration;
    8045                         baseConfigurationReference = 5183B3931379F85C00E8754E /* Shim.xcconfig */;
     8043                        baseConfigurationReference = A1EDD2DB1884B96400BBFE98 /* PluginProcessShim.xcconfig */;
    80468044                        buildSettings = {
    80478045                                OTHER_LDFLAGS = (
    … …  
    80958093                510031F31379CACB00C8DFE4 /* Debug */ = {
    80968094                        isa = XCBuildConfiguration;
    8097                         baseConfigurationReference = 5183B3931379F85C00E8754E /* Shim.xcconfig */;
     8095                        baseConfigurationReference = A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */;
    80988096                        buildSettings = {
    80998097                                PRODUCT_NAME = SecItemShim;
    … …  
    81038101                510031F41379CACB00C8DFE4 /* Release */ = {
    81048102                        isa = XCBuildConfiguration;
    8105                         baseConfigurationReference = 5183B3931379F85C00E8754E /* Shim.xcconfig */;
     8103                        baseConfigurationReference = A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */;
    81068104                        buildSettings = {
    81078105                                PRODUCT_NAME = SecItemShim;
    … …  
    81118109                510031F51379CACB00C8DFE4 /* Production */ = {
    81128110                        isa = XCBuildConfiguration;
    8113                         baseConfigurationReference = 5183B3931379F85C00E8754E /* Shim.xcconfig */;
     8111                        baseConfigurationReference = A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */;
    81148112                        buildSettings = {
    81158113                                PRODUCT_NAME = SecItemShim;
    … …  
    82108208                5D22D69C11A7534600BF30E5 /* Production */ = {
    82118209                        isa = XCBuildConfiguration;
     8210                        baseConfigurationReference = A1EDD2D91884ACE000BBFE98 /* All.xcconfig */;
    82128211                        buildSettings = {
    82138212                                PRODUCT_NAME = All;
    … …  
    84328431                CDC3830317211799008A2FC3 /* Debug */ = {
    84338432                        isa = XCBuildConfiguration;
    8434                         baseConfigurationReference = 5183B3931379F85C00E8754E /* Shim.xcconfig */;
     8433                        baseConfigurationReference = A1EDD2DD1884B9E300BBFE98 /* WebProcessShim.xcconfig */;
    84358434                        buildSettings = {
    84368435                                PRODUCT_NAME = WebProcessShim;
    … …  
    84408439                CDC3830417211799008A2FC3 /* Release */ = {
    84418440                        isa = XCBuildConfiguration;
    8442                         baseConfigurationReference = 5183B3931379F85C00E8754E /* Shim.xcconfig */;
     8441                        baseConfigurationReference = A1EDD2DD1884B9E300BBFE98 /* WebProcessShim.xcconfig */;
    84438442                        buildSettings = {
    84448443                                PRODUCT_NAME = WebProcessShim;
    … …  
    84488447                CDC3830517211799008A2FC3 /* Production */ = {
    84498448                        isa = XCBuildConfiguration;
    8450                         baseConfigurationReference = 5183B3931379F85C00E8754E /* Shim.xcconfig */;
     8449                        baseConfigurationReference = A1EDD2DD1884B9E300BBFE98 /* WebProcessShim.xcconfig */;
    84518450                        buildSettings = {
    84528451                                PRODUCT_NAME = WebProcessShim;

  • trunk/Source/WebKit2/WebProcess/mac/SecItemShimLibrary.mm

    r150089 r161918  
    2323 * THE POSSIBILITY OF SUCH DAMAGE.
    2424 */
     25
     26#if !PLATFORM(IOS)
     27
    2528#import "SecItemShimLibrary.h"
    2629
    … …  
    6770
    6871} // namespace WebKit
     72
     73#endif // !PLATFORM(IOS)
Note: See TracChangeset for help on using the changeset viewer.