diff options
| author | Erwin Jansen <jansene@google.com> | 2021-06-23 05:52:25 -0700 |
|---|---|---|
| committer | Erwin Jansen <jansene@google.com> | 2021-06-23 06:45:54 -0700 |
| commit | 16be34ae72cdb525c88c2b31b21b976f35fe36d8 (patch) | |
| tree | 6eacaffe4bebf8e00c290c1e1839e084b0c52e88 /pc/test/fake_peer_connection_base.h | |
| parent | 97e54a7e73c7b24e464ef06ef3c3b3716f21bb15 (diff) | |
| parent | 49cb4599560d6005d5df0dadfca2db04b288f216 (diff) | |
| download | webrtc-16be34ae72cdb525c88c2b31b21b976f35fe36d8.tar.gz | |
Merge upstream-master and enable ARM64
We bring in the latest WebRTC changes and turn on arm.
This adds a new third party lib: crc32c, and includes a workaround
for handling a depencency issue for arm.
Bug: 191745658
Change-Id: Ic5be99911990ef14a5f733f19394032b20f85024
Diffstat (limited to 'pc/test/fake_peer_connection_base.h')
| -rw-r--r-- | pc/test/fake_peer_connection_base.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pc/test/fake_peer_connection_base.h b/pc/test/fake_peer_connection_base.h index 1acf86fdac..7970dd0f0f 100644 --- a/pc/test/fake_peer_connection_base.h +++ b/pc/test/fake_peer_connection_base.h @@ -120,10 +120,11 @@ class FakePeerConnectionBase : public PeerConnectionInternal { return nullptr; } - rtc::scoped_refptr<DataChannelInterface> CreateDataChannel( + RTCErrorOr<rtc::scoped_refptr<DataChannelInterface>> CreateDataChannelOrError( const std::string& label, const DataChannelInit* config) override { - return nullptr; + return RTCError(RTCErrorType::UNSUPPORTED_OPERATION, + "Fake function called"); } const SessionDescriptionInterface* local_description() const override { |