Changeset 233995 in webkit


Ignore:
Timestamp:
Jul 19, 2018 12:06:36 PM (6 years ago)
Author:
Keith Rollin
Message:

Remove duplicate compilation of WebKitNSImageExtras.mm
​https://bugs.webkit.org/show_bug.cgi?id=187782

Reviewed by Alex Christensen.

WebKitNSImageExtras.mm gets compiled twice, once because it's in
WebCore.xcodeproj/project.pbxproj and once because it's in
Webcore/SourcesCocoa.txt. This can lead to duplicate definition
errors, particularly when building with LTO enabled. Fix this by
removing the entry from the Xcode project.

No new tests -- no change in WebKit functionality.

  • WebCore.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r233994 r233995  
     12018-07-19  Keith Rollin  <krollin@apple.com>
     2
     3        Remove duplicate compilation of WebKitNSImageExtras.mm
     4        https://bugs.webkit.org/show_bug.cgi?id=187782
     5
     6        Reviewed by Alex Christensen.
     7
     8        WebKitNSImageExtras.mm gets compiled twice, once because it's in
     9        WebCore.xcodeproj/project.pbxproj and once because it's in
     10        Webcore/SourcesCocoa.txt. This can lead to duplicate definition
     11        errors, particularly when building with LTO enabled. Fix this by
     12        removing the entry from the Xcode project.
     13
     14        No new tests -- no change in WebKit functionality.
     15
     16        * WebCore.xcodeproj/project.pbxproj:
     17
    1182018-07-19  Youenn Fablet  <youenn@apple.com>
    219

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

    r233846 r233995  
    20832083                7A0E771F10C00DB100A0276E /* JSInspectorFrontendHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A0E771D10C00DB100A0276E /* JSInspectorFrontendHost.h */; };
    20842084                7A1D7FCB18F85F0F00C385AD /* mediaControlsLocalizedStrings.js in Resources */ = {isa = PBXBuildFile; fileRef = 7A1D7FC918F85F0F00C385AD /* mediaControlsLocalizedStrings.js */; };
    2085                 7A22732020C9F9DA00DB1DEF /* WebKitNSImageExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7A22731E20C9F9D900DB1DEF /* WebKitNSImageExtras.mm */; };
    20862085                7A22732120C9FAFE00DB1DEF /* WebKitNSImageExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A22731F20C9F9DA00DB1DEF /* WebKitNSImageExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
    20872086                7A29F57218C69514004D0F81 /* OutOfBandTextTrackPrivateAVF.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A29F57118C69514004D0F81 /* OutOfBandTextTrackPrivateAVF.h */; };
    … …  
    3219732196                                2D06214F1DA63A9100A7FB26 /* WebKitMediaKeySession.cpp in Sources */,
    3219832197                                7C48A6D0191C9D6500026674 /* WebKitNamespace.cpp in Sources */,
    32199                                 7A22732020C9F9DA00DB1DEF /* WebKitNSImageExtras.mm in Sources */,
    3220032198                                0709D7921AE5557E004E42F8 /* WebMediaSessionManagerMac.cpp in Sources */,
    3220132199                                1CAF34820A6C405200ABE06E /* WebScriptObject.mm in Sources */,
Note: See TracChangeset for help on using the changeset viewer.