Changeset 212413 in webkit


Ignore:
Timestamp:
Feb 15, 2017, 4:54:49 PM (8 years ago)
Author:
achristensen@apple.com
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:
Location:
trunk/Source/ThirdParty/libwebrtc
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/ThirdParty/libwebrtc/ChangeLog

    r212401 r212413  
     12017-02-15  Alex Christensen  <achristensen@webkit.org>
     2
     3        Fix ASAN build after r212401
     4        https://bugs.webkit.org/show_bug.cgi?id=168398
     5
     6        * Source/webrtc/media/engine/webrtcvideocapturer.cc:
     7        * libwebrtc.xcodeproj/project.pbxproj:
     8
    192017-02-15  Alex Christensen  <achristensen@webkit.org>
    210

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/media/engine/webrtcvideocapturer.cc

    r210942 r212413  
    5050      int id,
    5151      const char* device) {
     52#if RTC_HAS_ASAN
     53    // FIXME: this shouldn't be necessary.
     54    return nullptr;
     55#else
    5256    return webrtc::VideoCaptureFactory::Create(id, device);
     57#endif
    5358  }
    5459  virtual webrtc::VideoCaptureModule::DeviceInfo* CreateDeviceInfo(int id) {
     60#if RTC_HAS_ASAN
     61    // FIXME: this shouldn't be necessary.
     62    return nullptr;
     63#else
    5564    return webrtc::VideoCaptureFactory::CreateDeviceInfo(id);
     65#endif
    5666  }
    5767  virtual void DestroyDeviceInfo(webrtc::VideoCaptureModule::DeviceInfo* info) {

  • trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj

    r212401 r212413  
    5454                5C0073121E5513E70042215A /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C00730D1E5513E70042215A /* CoreVideo.framework */; };
    5555                5C0073141E5514020042215A /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0073131E5514020042215A /* VideoToolbox.framework */; };
     56                5C0073431E552C800042215A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0073411E552C800042215A /* CoreGraphics.framework */; };
     57                5C0073441E552C800042215A /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0073421E552C800042215A /* Security.framework */; };
     58                5C0073461E552CA20042215A /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0073451E552CA20042215A /* SystemConfiguration.framework */; };
    5659                5C0884E31E4A986000403995 /* compare.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4D341E4323D4002651C8 /* compare.cc */; };
    5760                5C0884E41E4A986000403995 /* compare_common.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B4D2F1E4323D4002651C8 /* compare_common.cc */; };
    … …  
    26722675                5C00730D1E5513E70042215A /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
    26732676                5C0073131E5514020042215A /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
     2677                5C0073411E552C800042215A /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
     2678                5C0073421E552C800042215A /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
     2679                5C0073451E552CA20042215A /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
    26742680                5C0884891E4A978C00403995 /* libsrtp.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = libsrtp.xcconfig; sourceTree = "<group>"; };
    26752681                5C08848A1E4A978C00403995 /* libyuv.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = libyuv.xcconfig; sourceTree = "<group>"; };
    … …  
    51185124                        buildActionMask = 2147483647;
    51195125                        files = (
     5126                                5C0073461E552CA20042215A /* SystemConfiguration.framework in Frameworks */,
     5127                                5C0073431E552C800042215A /* CoreGraphics.framework in Frameworks */,
     5128                                5C0073441E552C800042215A /* Security.framework in Frameworks */,
    51205129                                5C0073141E5514020042215A /* VideoToolbox.framework in Frameworks */,
    51215130                                5C00730E1E5513E70042215A /* AudioToolbox.framework in Frameworks */,
    … …  
    71577166                        isa = PBXGroup;
    71587167                        children = (
     7168                                5C0073451E552CA20042215A /* SystemConfiguration.framework */,
     7169                                5C0073411E552C800042215A /* CoreGraphics.framework */,
     7170                                5C0073421E552C800042215A /* Security.framework */,
    71597171                                5C0073131E5514020042215A /* VideoToolbox.framework */,
    71607172                                5C0073091E5513E70042215A /* AudioToolbox.framework */,
Note: See TracChangeset for help on using the changeset viewer.