Title: [212413] trunk/Source/ThirdParty/libwebrtc
- Revision
- 212413
- Author
- achristen...@apple.com
- Date
- 2017-02-15 16:54:49 -0800 (Wed, 15 Feb 2017)
Log Message
Fix ASAN build after r212401
https://bugs.webkit.org/show_bug.cgi?id=168398
* Source/webrtc/media/engine/webrtcvideocapturer.cc:
* libwebrtc.xcodeproj/project.pbxproj:
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (212412 => 212413)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2017-02-16 00:42:58 UTC (rev 212412)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2017-02-16 00:54:49 UTC (rev 212413)
@@ -1,5 +1,13 @@
2017-02-15 Alex Christensen <achristen...@webkit.org>
+ Fix ASAN build after r212401
+ https://bugs.webkit.org/show_bug.cgi?id=168398
+
+ * Source/webrtc/media/engine/webrtcvideocapturer.cc:
+ * libwebrtc.xcodeproj/project.pbxproj:
+
+2017-02-15 Alex Christensen <achristen...@webkit.org>
+
Make libwebrtc.dylib
https://bugs.webkit.org/show_bug.cgi?id=168335
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/media/engine/webrtcvideocapturer.cc (212412 => 212413)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/media/engine/webrtcvideocapturer.cc 2017-02-16 00:42:58 UTC (rev 212412)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/media/engine/webrtcvideocapturer.cc 2017-02-16 00:54:49 UTC (rev 212413)
@@ -49,10 +49,20 @@
virtual rtc::scoped_refptr<webrtc::VideoCaptureModule> Create(
int id,
const char* device) {
+#if RTC_HAS_ASAN
+ // FIXME: this shouldn't be necessary.
+ return nullptr;
+#else
return webrtc::VideoCaptureFactory::Create(id, device);
+#endif
}
virtual webrtc::VideoCaptureModule::DeviceInfo* CreateDeviceInfo(int id) {
+#if RTC_HAS_ASAN
+ // FIXME: this shouldn't be necessary.
+ return nullptr;
+#else
return webrtc::VideoCaptureFactory::CreateDeviceInfo(id);
+#endif
}
virtual void DestroyDeviceInfo(webrtc::VideoCaptureModule::DeviceInfo* info) {
delete info;
Modified: trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj (212412 => 212413)
--- trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj 2017-02-16 00:42:58 UTC (rev 212412)
+++ trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj 2017-02-16 00:54:49 UTC (rev 212413)
@@ -53,6 +53,9 @@
5C0073111E5513E70042215A /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C00730C1E5513E70042215A /* CoreMedia.framework */; };
5C0073121E5513E70042215A /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C00730D1E5513E70042215A /* CoreVideo.framework */; };
5C0073141E5514020042215A /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0073131E5514020042215A /* VideoToolbox.framework */; };
+ 5C0073431E552C800042215A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0073411E552C800042215A /* CoreGraphics.framework */; };
+ 5C0073441E552C800042215A /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0073421E552C800042215A /* Security.framework */; };
+ 5C0073461E552CA20042215A /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0073451E552CA20042215A /* SystemConfiguration.framework */; };
5C0884E31E4A986000403995 /* compare.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4D341E4323D4002651C8 /* compare.cc */; };
5C0884E41E4A986000403995 /* compare_common.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4D2F1E4323D4002651C8 /* compare_common.cc */; };
5C0884E51E4A986000403995 /* compare_gcc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5CDD84211E439BCB00621E92 /* compare_gcc.cc */; };
@@ -2671,6 +2674,9 @@
5C00730C1E5513E70042215A /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
5C00730D1E5513E70042215A /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
5C0073131E5514020042215A /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
+ 5C0073411E552C800042215A /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
+ 5C0073421E552C800042215A /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
+ 5C0073451E552CA20042215A /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
5C0884891E4A978C00403995 /* libsrtp.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = libsrtp.xcconfig; sourceTree = "<group>"; };
5C08848A1E4A978C00403995 /* libyuv.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = libyuv.xcconfig; sourceTree = "<group>"; };
5C0884D11E4A97E300403995 /* libsrtp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsrtp.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -5117,6 +5123,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 5C0073461E552CA20042215A /* SystemConfiguration.framework in Frameworks */,
+ 5C0073431E552C800042215A /* CoreGraphics.framework in Frameworks */,
+ 5C0073441E552C800042215A /* Security.framework in Frameworks */,
5C0073141E5514020042215A /* VideoToolbox.framework in Frameworks */,
5C00730E1E5513E70042215A /* AudioToolbox.framework in Frameworks */,
5C00730F1E5513E70042215A /* AVFoundation.framework in Frameworks */,
@@ -7156,6 +7165,9 @@
5CB3048A1DE4143400D2C405 /* Frameworks */ = {
isa = PBXGroup;
children = (
+ 5C0073451E552CA20042215A /* SystemConfiguration.framework */,
+ 5C0073411E552C800042215A /* CoreGraphics.framework */,
+ 5C0073421E552C800042215A /* Security.framework */,
5C0073131E5514020042215A /* VideoToolbox.framework */,
5C0073091E5513E70042215A /* AudioToolbox.framework */,
5C00730A1E5513E70042215A /* AVFoundation.framework */,
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
