Bug 806819 - Part 5: Update webrtc moz.build. r=jesup, r=gps

--HG--
extra : rebase_source : 49c98530c07d38998be67cceb8047f74b971532f
This commit is contained in:
Eric Rahm 2014-10-06 13:14:29 -07:00
parent e523216532
commit 7756219f76

View File

@ -51,153 +51,54 @@ if CONFIG['MOZ_WEBRTC_SIGNALING']:
build_for_test=0
)
GYP_DIRS['signaling'].sandbox_vars['FINAL_LIBRARY'] = 'xul'
# Excluded because of name clash in the logTag variable
signaling_non_unified_sources = [
'signaling/src/sipcc/core/gsm/fim.c', # Because of name clash in the logTag variable
'signaling/src/sipcc/core/gsm/gsm_sdp.c', # Because of name clash in the logTag variable
'signaling/src/sipcc/core/gsm/lsm.c', # Because of name clash in the logTag variable
'signaling/src/sipcc/core/sdp/sdp_base64.c', # Because of name clash with the macro PADDING
]
# These files cannot be built in unified mode because they force NSPR logging.
signaling_non_unified_sources_2 = [
'signaling/src/callcontrol/CallControlManagerImpl.cpp',
'signaling/src/common/browser_logging/CSFLog.cpp',
'signaling/src/media-conduit/AudioConduit.cpp',
'signaling/src/media-conduit/CodecStatistics.cpp',
'signaling/src/media-conduit/VideoConduit.cpp',
'signaling/src/media-conduit/WebrtcOMXH264VideoCodec.cpp',
'signaling/src/media/CSFAudioControlWrapper.cpp',
'signaling/src/media/CSFVideoControlWrapper.cpp',
'signaling/src/media/VcmSIPCCBinding.cpp',
'signaling/src/mediapipeline/MediaPipeline.cpp',
'signaling/src/mediapipeline/MediaPipelineFilter.cpp',
'signaling/src/mediapipeline/SrtpFlow.cpp',
'signaling/src/peerconnection/MediaStreamList.cpp',
'signaling/src/peerconnection/PeerConnectionCtx.cpp',
'signaling/src/peerconnection/PeerConnectionImpl.cpp',
'signaling/src/peerconnection/PeerConnectionMedia.cpp',
'signaling/src/peerconnection/WebrtcGlobalInformation.cpp',
'signaling/src/sipcc/core/ccapp/call_logger.c',
'signaling/src/sipcc/core/ccapp/capability_set.c',
'signaling/src/sipcc/core/ccapp/cc_call_feature.c',
'signaling/src/sipcc/core/ccapp/cc_config.c',
'signaling/src/sipcc/core/ccapp/cc_device_feature.c',
'signaling/src/sipcc/core/ccapp/cc_device_manager.c',
'signaling/src/sipcc/core/ccapp/cc_info.c',
'signaling/src/sipcc/core/ccapp/cc_service.c',
'signaling/src/sipcc/core/ccapp/ccapi_call.c',
'signaling/src/sipcc/core/ccapp/ccapi_call_info.c',
'signaling/src/sipcc/core/ccapp/ccapi_config.c',
'signaling/src/sipcc/core/ccapp/ccapi_device.c',
'signaling/src/sipcc/core/ccapp/ccapi_device_info.c',
'signaling/src/sipcc/core/ccapp/ccapi_feature_info.c',
'signaling/src/sipcc/core/ccapp/ccapi_line_info.c',
'signaling/src/sipcc/core/ccapp/ccapi_service.c',
'signaling/src/sipcc/core/ccapp/ccapi_snapshot.c',
'signaling/src/sipcc/core/ccapp/ccapp_task.c',
'signaling/src/sipcc/core/ccapp/ccprovider.c',
'signaling/src/sipcc/core/ccapp/conf_roster.c',
'signaling/src/sipcc/core/common/cfgfile_utils.c',
'signaling/src/sipcc/core/common/config_api.c',
'signaling/src/sipcc/core/common/config_parser.c',
'signaling/src/sipcc/core/common/init.c',
'signaling/src/sipcc/core/common/logger.c',
'signaling/src/sipcc/core/common/misc.c',
'signaling/src/sipcc/core/common/plat.c',
'signaling/src/sipcc/core/common/platform_api.c',
'signaling/src/sipcc/core/common/prot_configmgr.c',
'signaling/src/sipcc/core/common/resource_manager.c',
'signaling/src/sipcc/core/common/subscription_handler.c',
'signaling/src/sipcc/core/common/ui.c',
'signaling/src/sipcc/core/gsm/ccapi.c',
'signaling/src/sipcc/core/gsm/ccapi_strings.c',
'signaling/src/sipcc/core/gsm/dcsm.c',
'signaling/src/sipcc/core/gsm/fsm.c',
'signaling/src/sipcc/core/gsm/fsmb2bcnf.c',
'signaling/src/sipcc/core/gsm/fsmcac.c',
'signaling/src/sipcc/core/gsm/fsmcnf.c',
'signaling/src/sipcc/core/gsm/fsmdef.c',
'signaling/src/sipcc/core/gsm/fsmxfr.c',
'signaling/src/sipcc/core/gsm/gsm.c',
'signaling/src/sipcc/core/gsm/gsm_sdp_crypto.c',
'signaling/src/sipcc/core/gsm/media_cap_tbl.c',
'signaling/src/sipcc/core/gsm/sm.c',
'signaling/src/sipcc/core/gsm/subapi.c',
'signaling/src/sipcc/core/sdp/ccsdp.c',
'signaling/src/sipcc/core/gsm/fim.c',
'signaling/src/sipcc/core/gsm/gsm_sdp.c',
'signaling/src/sipcc/core/gsm/lsm.c',
'signaling/src/sipcc/core/sdp/sdp_access.c',
'signaling/src/sipcc/core/sdp/sdp_attr.c',
'signaling/src/sipcc/core/sdp/sdp_attr_access.c',
'signaling/src/sipcc/core/sdp/sdp_config.c',
'signaling/src/sipcc/core/sdp/sdp_main.c',
'signaling/src/sipcc/core/sdp/sdp_services_unix.c',
'signaling/src/sipcc/core/sdp/sdp_token.c',
'signaling/src/sipcc/core/sdp/sdp_utils.c',
'signaling/src/sipcc/core/sipstack/ccsip_callinfo.c',
'signaling/src/sipcc/core/sipstack/ccsip_cc.c',
'signaling/src/sipcc/core/sipstack/ccsip_common_util.c',
'signaling/src/sipcc/core/sipstack/ccsip_core.c',
'signaling/src/sipcc/core/sipstack/ccsip_debug.c',
'signaling/src/sipcc/core/sipstack/ccsip_info.c',
'signaling/src/sipcc/core/sipstack/ccsip_messaging.c',
'signaling/src/sipcc/core/sipstack/ccsip_platform.c',
'signaling/src/sipcc/core/sipstack/ccsip_platform_tcp.c',
'signaling/src/sipcc/core/sipstack/ccsip_platform_timers.c',
'signaling/src/sipcc/core/sipstack/ccsip_platform_tls.c',
'signaling/src/sipcc/core/sipstack/ccsip_platform_udp.c',
'signaling/src/sipcc/core/sipstack/ccsip_pmh.c',
'signaling/src/sipcc/core/sipstack/ccsip_publish.c',
'signaling/src/sipcc/core/sipstack/ccsip_register.c',
'signaling/src/sipcc/core/sipstack/ccsip_reldev.c',
'signaling/src/sipcc/core/sipstack/ccsip_sdp.c',
'signaling/src/sipcc/core/sipstack/ccsip_spi_utils.c',
'signaling/src/sipcc/core/sipstack/ccsip_subsmanager.c',
'signaling/src/sipcc/core/sipstack/ccsip_task.c',
'signaling/src/sipcc/core/sipstack/httpish.c',
'signaling/src/sipcc/core/sipstack/sip_common_regmgr.c',
'signaling/src/sipcc/core/sipstack/sip_common_transport.c',
'signaling/src/sipcc/core/sipstack/sip_csps_transport.c',
'signaling/src/sipcc/core/sipstack/sip_interface_regmgr.c',
'signaling/src/sipcc/core/sipstack/sip_platform_task.c',
'signaling/src/sipcc/core/sipstack/sip_platform_win32_task.c',
'signaling/src/sipcc/core/src-common/configapp.c',
'signaling/src/sipcc/core/src-common/dialplan.c',
'signaling/src/sipcc/core/src-common/dialplanint.c',
'signaling/src/sipcc/core/src-common/digcalc.c',
'signaling/src/sipcc/core/src-common/kpml_common_util.c',
'signaling/src/sipcc/core/src-common/kpmlmap.c',
'signaling/src/sipcc/core/src-common/misc_apps_task.c',
'signaling/src/sipcc/core/src-common/pres_sub_not_handler.c',
'signaling/src/sipcc/core/src-common/publish_int.c',
'signaling/src/sipcc/core/src-common/string_lib.c',
'signaling/src/sipcc/core/src-common/util_ios_queue.c',
'signaling/src/sipcc/cpr/android/cpr_android_init.c',
'signaling/src/sipcc/cpr/android/cpr_android_stdio.c',
'signaling/src/sipcc/cpr/android/cpr_android_timers_using_select.c',
'signaling/src/sipcc/cpr/darwin/cpr_darwin_init.c',
'signaling/src/sipcc/cpr/darwin/cpr_darwin_stdio.c',
'signaling/src/sipcc/cpr/darwin/cpr_darwin_timers_using_select.c',
'signaling/src/sipcc/cpr/linux/cpr_linux_init.c',
'signaling/src/sipcc/cpr/linux/cpr_linux_stdio.c',
'signaling/src/sipcc/cpr/linux/cpr_linux_timers_using_select.c',
'signaling/src/sipcc/cpr/win32/cpr_win_stdio.c',
'signaling/src/sipcc/cpr/win32/cpr_win_timers.c',
'signaling/src/sipcc/plat/common/dns_utils.c',
'signaling/src/sipcc/plat/csf2g/reset_api.c',
'signaling/src/sipcc/plat/win32/dns_utils.c',
'signaling/src/sipcc/plat/win32/mystub.c',
'signaling/src/sipcc/plat/win32/plat_api_stub.c',
'signaling/src/sipcc/plat/win32/plat_api_win.c',
'signaling/src/softphonewrapper/CC_SIPCCCall.cpp',
'signaling/src/softphonewrapper/CC_SIPCCCallInfo.cpp',
'signaling/src/softphonewrapper/CC_SIPCCCallServerInfo.cpp',
'signaling/src/softphonewrapper/CC_SIPCCDevice.cpp',
'signaling/src/softphonewrapper/CC_SIPCCDeviceInfo.cpp',
'signaling/src/softphonewrapper/CC_SIPCCFeatureInfo.cpp',
'signaling/src/softphonewrapper/CC_SIPCCLine.cpp',
'signaling/src/softphonewrapper/CC_SIPCCLineInfo.cpp',
'signaling/src/softphonewrapper/CC_SIPCCService.cpp',
'signaling/src/softphonewrapper/ccapi_plat_api_impl.cpp',
]
# Excluded for various symbol conflicts
signaling_non_unified_sources_2 = [
'signaling/src/mediapipeline/MediaPipelineFilter.cpp',
'signaling/src/mediapipeline/SrtpFlow.cpp',
'signaling/src/sipcc/core/ccapp/ccapi_call_info.c',
'signaling/src/sipcc/core/ccapp/ccprovider.c',
'signaling/src/sipcc/core/common/platform_api.c',
'signaling/src/sipcc/core/common/ui.c',
'signaling/src/sipcc/core/gsm/ccapi_strings.c',
'signaling/src/sipcc/core/gsm/fsm.c',
'signaling/src/sipcc/core/gsm/fsmcac.c',
'signaling/src/sipcc/core/gsm/fsmdef.c',
'signaling/src/sipcc/core/sdp/sdp_base64.c', # Because of name clash with the macro PADDING
'signaling/src/sipcc/core/sipstack/ccsip_cc.c',
'signaling/src/sipcc/core/sipstack/sip_common_transport.c',
'signaling/src/sipcc/core/sipstack/sip_platform_task.c',
'signaling/src/sipcc/core/src-common/string_lib.c',
]
GYP_DIRS['signaling'].non_unified_sources += signaling_non_unified_sources
GYP_DIRS['signaling'].non_unified_sources += signaling_non_unified_sources_2