Title: [275663] trunk/Source/WebKit
- Revision
- 275663
- Author
- [email protected]
- Date
- 2021-04-08 11:21:19 -0700 (Thu, 08 Apr 2021)
Log Message
Unreviewed, fix the internal build after r275640
https://bugs.webkit.org/show_bug.cgi?id=224239
* WebKit.xcodeproj/project.pbxproj:
This source file was added to the project as a compilation target, but it also appears in unified sources; this
causes the `encode` and `decode` methods to be defined twice, leading to a linker error. Fix this by only
including it as a unified source.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (275662 => 275663)
--- trunk/Source/WebKit/ChangeLog 2021-04-08 18:17:31 UTC (rev 275662)
+++ trunk/Source/WebKit/ChangeLog 2021-04-08 18:21:19 UTC (rev 275663)
@@ -1,3 +1,13 @@
+2021-04-08 Wenson Hsieh <[email protected]>
+
+ Unreviewed, fix the internal build after r275640
+ https://bugs.webkit.org/show_bug.cgi?id=224239
+
+ * WebKit.xcodeproj/project.pbxproj:
+ This source file was added to the project as a compilation target, but it also appears in unified sources; this
+ causes the `encode` and `decode` methods to be defined twice, leading to a linker error. Fix this by only
+ including it as a unified source.
+
2021-04-08 Jer Noble <[email protected]>
[Swift] Move the "Copy Additional Sources" Build Phase into the WebKitSwift target
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (275662 => 275663)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-04-08 18:17:31 UTC (rev 275662)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2021-04-08 18:21:19 UTC (rev 275663)
@@ -1096,7 +1096,6 @@
51FAEC3A1B0657630009C4E7 /* AuxiliaryProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FAEC371B0657310009C4E7 /* AuxiliaryProcessMessages.h */; };
51FAEC3B1B0657680009C4E7 /* AuxiliaryProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51FAEC361B0657310009C4E7 /* AuxiliaryProcessMessageReceiver.cpp */; };
51FD18B61651FBAD00DBE1CE /* NetworkResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FD18B41651FBAD00DBE1CE /* NetworkResourceLoader.h */; };
- 525080B0261BDE6C00678AEE /* XRDeviceInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 525080AD261BDE6B00678AEE /* XRDeviceInfo.mm */; };
525080B1261BDE6C00678AEE /* XRDeviceIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 525080AE261BDE6B00678AEE /* XRDeviceIdentifier.h */; };
525080B2261BDE6C00678AEE /* XRDeviceInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 525080AF261BDE6C00678AEE /* XRDeviceInfo.h */; };
5272D4C91E735F0900EB4290 /* WKProtectionSpaceNS.h in Headers */ = {isa = PBXBuildFile; fileRef = 5272D4C71E735F0900EB4290 /* WKProtectionSpaceNS.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -14436,7 +14435,6 @@
CE212160240EE571006ED443 /* WKTextPlaceholder.mm in Sources */,
C14D306924B79BE000480387 /* XPCEndpoint.mm in Sources */,
C14D306A24B79BE400480387 /* XPCEndpointClient.mm in Sources */,
- 525080B0261BDE6C00678AEE /* XRDeviceInfo.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
