Closed Bug 782936 Opened 12 years ago Closed 12 years ago

Conditionally build SCTP code when WebRTC is enabled

Categories

(Firefox Build System :: General, defect)

defect
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: ted, Assigned: ted)

References

Details

Attachments

(1 file)

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.
Blocks: 729511
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
Attachment #652086 - Flags: review?(rjesup) → review+
Status: NEW → RESOLVED
Closed: 12 years ago
Resolution: --- → FIXED
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: