Changeset 162104 in webkit


Ignore:
Timestamp:
Jan 15, 2014 5:06:40 PM (10 years ago)
Author:
aestes@apple.com
Message:

[iOS] Properly exclude the shim dylibs this time
​https://bugs.webkit.org/show_bug.cgi?id=127075

Reviewed by Anders Carlsson.

BaseLegacyProcess.xcconfig was setting EXCLUDED_SOURCE_FILE_NAMES in
conflict with what I added in r161918, and I misspelled the setting
name in two instances. Fix these two bugs.

Also remove a vestigial OTHER_LDFLAGS from WebContentProcess.xcconfig
while we're here.

  • Configurations/BaseLegacyProcess.xcconfig:
  • Configurations/NetworkProcess.xcconfig:
  • Configurations/PluginProcess.xcconfig:
  • Configurations/WebContentProcess.xcconfig:
Location:
trunk/Source/WebKit2
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r162103 r162104  
     12014-01-15  Andy Estes  <aestes@apple.com>
     2
     3        [iOS] Properly exclude the shim dylibs this time
     4        https://bugs.webkit.org/show_bug.cgi?id=127075
     5
     6        Reviewed by Anders Carlsson.
     7
     8        BaseLegacyProcess.xcconfig was setting EXCLUDED_SOURCE_FILE_NAMES in
     9        conflict with what I added in r161918, and I misspelled the setting
     10        name in two instances. Fix these two bugs.
     11
     12        Also remove a vestigial OTHER_LDFLAGS from WebContentProcess.xcconfig
     13        while we're here.
     14
     15        * Configurations/BaseLegacyProcess.xcconfig:
     16        * Configurations/NetworkProcess.xcconfig:
     17        * Configurations/PluginProcess.xcconfig:
     18        * Configurations/WebContentProcess.xcconfig:
     19
    1202014-01-15  Enrica Casucci  <enrica@apple.com>
    221

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

    r161829 r162104  
    3838
    3939EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION));
    40 EXCLUDED_SOURCE_FILE_NAMES_Production = WebKit.icns;
     40EXCLUDED_SOURCE_FILE_NAMES_Production = $(EXCLUDED_SHIM_FILE_NAME) WebKit.icns;
     41EXCLUDED_SOURCE_FILE_NAMES_Debug = $(EXCLUDED_SHIM_FILE_NAME);
     42EXCLUDED_SOURCE_FILE_NAMES_Release = $(EXCLUDED_SHIM_FILE_NAME);
     43

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

    r161918 r162104  
    2727INFOPLIST_FILE = NetworkProcess/EntryPoint/mac/LegacyProcess/Info.plist;
    2828
    29 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAME_$(PLATFORM_NAME));
    30 EXCLUDED_SOURCE_FILE_NAMES_iphoneos = SecItemShim.dylib;
    31 EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
     29EXCLUDED_SHIM_FILE_NAME = $(EXCLUDED_SHIM_FILE_NAME_$(PLATFORM_NAME));
     30EXCLUDED_SHIM_FILE_NAME_iphoneos = SecItemShim.dylib;
     31EXCLUDED_SHIM_FILE_NAME_iphonesimulator = $(EXCLUDED_SHIM_FILE_NAME_iphoneos);

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

    r161918 r162104  
    2828CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
    2929
    30 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAME_$(PLATFORM_NAME));
    31 EXCLUDED_SOURCE_FILE_NAMES_iphoneos = PluginProcessShim.dylib;
    32 EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
     30EXCLUDED_SHIM_FILE_NAME = $(EXCLUDED_SHIM_FILE_NAME_$(PLATFORM_NAME));
     31EXCLUDED_SHIM_FILE_NAME_iphoneos = PluginProcessShim.dylib;
     32EXCLUDED_SHIM_FILE_NAME_iphonesimulator = $(EXCLUDED_SHIM_FILE_NAME_iphoneos);
    3333
    3434SKIP_INSTALL = $(SKIP_INSTALL_$(PLATFORM_NAME));

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

    r161918 r162104  
    2727INFOPLIST_FILE = WebProcess/EntryPoint/mac/LegacyProcess/Info.plist;
    2828
    29 OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
    30 OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    31 OTHER_LDFLAGS_macosx_1080 = ;
    32 OTHER_LDFLAGS_macosx_1090 = ;
    33 OTHER_LDFLAGS_macosx_101000 = $(OTHER_LDFLAGS_macosx_1090);
    34 OTHER_LDFLAGS_iphoneos = ;
    35 OTHER_LDFLAGS_iphonesimulator = ;
    36 
    37 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAME_$(PLATFORM_NAME));
    38 EXCLUDED_SOURCE_FILE_NAMES_iphoneos = WebProcessShim.dylib;
    39 EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
     29EXCLUDED_SHIM_FILE_NAME = $(EXCLUDED_SHIM_FILE_NAME_$(PLATFORM_NAME));
     30EXCLUDED_SHIM_FILE_NAME_iphoneos = WebProcessShim.dylib;
     31EXCLUDED_SHIM_FILE_NAME_iphonesimulator = $(EXCLUDED_SHIM_FILE_NAME_iphoneos);
Note: See TracChangeset for help on using the changeset viewer.