821849 - Android build broken in DataChannel code

Status: RESOLVED FIXED

(Core :: WebRTC: Networking, defect)

Description

[Dan Mosedale (:dmosedale, :dmose)]

Attachment: Re-apply DeMorgan's law to preprocessor conditions

Here's the error:

/Users/dmose/r/inbound/src/netwerk/sctp/datachannel/DataChannel.cpp: In member function 'virtual nsresult mozilla::DataChannelConnectRunnable::Run()':
/Users/dmose/r/inbound/src/netwerk/sctp/datachannel/DataChannel.cpp:397: error: 'struct sockaddr_conn' has no member named 'sconn_len'

In the directory  /Users/dmose/r/inbound/objdir-droid/netwerk/sctp/datachannel
The following command failed to execute properly:

I think there was a race in the creation of the cleanup patch such that when the cleanup patch landed, it regressed a fix for this problem which had landed previously.  Patch for bustage attached.

Comment 1

[Dan Mosedale (:dmosedale, :dmose)]

Try server build in progress:

 https://tbpl.mozilla.org/?tree=Try&rev=f73d6ea2a425

Comment 2

[Dan Mosedale (:dmosedale, :dmose)]

Pushed to inbound:

https://hg.mozilla.org/integration/mozilla-inbound/rev/bb6f5a9bcd27

in-testsuite-, as this is build bustage fixing, so the compiler acts as the test suite.

Comment 3

[Ed Morley [:emorley]]

(In reply to Dan Mosedale (:dmose) from comment #2)
> Pushed to inbound:
> 
> https://hg.mozilla.org/integration/mozilla-inbound/rev/bb6f5a9bcd27
> 
> in-testsuite-, as this is build bustage fixing, so the compiler acts as the
> test suite.

This was mis-posted in bug 821249, because the wrong bug number was in the commit message.

https://hg.mozilla.org/mozilla-central/rev/bb6f5a9bcd27