Remove duplicate compilation of WebKitNSImageExtras.mm
authorkrollin@apple.com <krollin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Jul 2018 19:06:36 +0000 (19:06 +0000)
committerkrollin@apple.com <krollin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Jul 2018 19:06:36 +0000 (19:06 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@233995 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/WebCore.xcodeproj/project.pbxproj

index 305faa6..b953fd3 100644 (file)
@@ -1,3 +1,20 @@
+2018-07-19  Keith Rollin  <krollin@apple.com>
+
+        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:
+
 2018-07-19  Youenn Fablet  <youenn@apple.com>
 
         FetchResponse should close its stream when loading finishes
index 2d60259..a6de387 100644 (file)
                7A0E770F10C00A8800A0276E /* InspectorFrontendHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A0E770C10C00A8800A0276E /* InspectorFrontendHost.h */; settings = {ATTRIBUTES = (Private, ); }; };
                7A0E771F10C00DB100A0276E /* JSInspectorFrontendHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A0E771D10C00DB100A0276E /* JSInspectorFrontendHost.h */; };
                7A1D7FCB18F85F0F00C385AD /* mediaControlsLocalizedStrings.js in Resources */ = {isa = PBXBuildFile; fileRef = 7A1D7FC918F85F0F00C385AD /* mediaControlsLocalizedStrings.js */; };
-               7A22732020C9F9DA00DB1DEF /* WebKitNSImageExtras.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7A22731E20C9F9D900DB1DEF /* WebKitNSImageExtras.mm */; };
                7A22732120C9FAFE00DB1DEF /* WebKitNSImageExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A22731F20C9F9DA00DB1DEF /* WebKitNSImageExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
                7A29F57218C69514004D0F81 /* OutOfBandTextTrackPrivateAVF.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A29F57118C69514004D0F81 /* OutOfBandTextTrackPrivateAVF.h */; };
                7A45032F18DB717200377B34 /* BufferedLineReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A45032D18DB717200377B34 /* BufferedLineReader.cpp */; };
                                2D06214D1DA63A8B00A7FB26 /* WebKitMediaKeys.cpp in Sources */,
                                2D06214F1DA63A9100A7FB26 /* WebKitMediaKeySession.cpp in Sources */,
                                7C48A6D0191C9D6500026674 /* WebKitNamespace.cpp in Sources */,
-                               7A22732020C9F9DA00DB1DEF /* WebKitNSImageExtras.mm in Sources */,
                                0709D7921AE5557E004E42F8 /* WebMediaSessionManagerMac.cpp in Sources */,
                                1CAF34820A6C405200ABE06E /* WebScriptObject.mm in Sources */,
                                F12171F516A8CED2000053CA /* WebVTTElement.cpp in Sources */,