Last Comment Bug 782936 - Conditionally build SCTP code when WebRTC is enabled
: Conditionally build SCTP code when WebRTC is enabled
Status: RESOLVED FIXED
:
Product: Core
Classification: Components
Component: Build Config (show other bugs)
: unspecified
: All All
: -- normal (vote)
: ---
Assigned To: Ted Mielczarek [:ted.mielczarek]
:
Mentors:
Depends on:
Blocks: 729511
  Show dependency treegraph
 
Reported: 2012-08-15 06:29 PDT by Ted Mielczarek [:ted.mielczarek]
Modified: 2012-08-16 11:38 PDT (History)
1 user (show)
See Also:
Crash Signature:
(edit)
QA Whiteboard:
Iteration: ---
Points: ---
Has Regression Range: ---
Has STR: ---


Attachments
Conditionally build SCTP code when WebRTC is enabled (8.25 KB, patch)
2012-08-15 06:29 PDT, Ted Mielczarek [:ted.mielczarek]
rjesup: review+
Details | Diff | Splinter Review

Description Ted Mielczarek [:ted.mielczarek] 2012-08-15 06:29:38 PDT
Currently on alder we build SCTP unconditionally. It's broken on Android, and it's wasteful to build this if we aren't using it.
Comment 1 Ted Mielczarek [:ted.mielczarek] 2012-08-15 06:29:46 PDT
Created attachment 652086 [details] [diff] [review]
Conditionally build SCTP code when WebRTC is enabled
Comment 2 Randell Jesup [:jesup] 2012-08-15 20:18:31 PDT
Comment on attachment 652086 [details] [diff] [review]
Conditionally build SCTP code when WebRTC is enabled

Review of attachment 652086 [details] [diff] [review]:
-----------------------------------------------------------------

r+ with switching the items mentioned to MOZ_WEBRTC

::: content/base/src/Makefile.in
@@ +140,5 @@
> +ifdef MOZ_SCTP
> +EXPORTS += nsDOMDataChannel.h
> +CPPSRCS += nsDOMDataChannel.cpp
> +endif
> +

We should only build nsDOMDataChannel (IMHO) if WebRTC is on (which also mandates SCTP).  The only way to use nsDOMDataChannel is via PeerConnection->createDataChannel().

::: dom/base/nsDOMClassInfo.cpp
@@ +543,2 @@
>  #include "nsIDOMDataChannel.h"
> +#endif

Ditto

@@ +1707,3 @@
>    NS_DEFINE_CLASSINFO_DATA(DataChannel, nsEventTargetSH,
>                             EVENTTARGET_SCRIPTABLE_FLAGS)
> +#endif

Ditto

@@ +4519,5 @@
>    DOM_CLASSINFO_MAP_BEGIN(DataChannel, nsIDOMDataChannel)
>      DOM_CLASSINFO_MAP_ENTRY(nsIDOMDataChannel)
>      DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
>    DOM_CLASSINFO_MAP_END
> +#endif

Ditto

::: dom/base/nsDOMClassInfoClasses.h
@@ +543,3 @@
>  DOMCI_CLASS(DataChannel)
> +#endif
> +

Ditto, and kill the blank line at the end
Comment 3 Ted Mielczarek [:ted.mielczarek] 2012-08-16 11:38:46 PDT
https://hg.mozilla.org/projects/alder/rev/90438944f88c

Note You need to log in before you can comment on or make changes to this bug.