diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | remoting/protocol/ice_transport_channel.cc | 2 | ||||
| -rw-r--r-- | remoting/remoting_nacl.gyp | 2 | ||||
| -rw-r--r-- | third_party/libjingle/BUILD.gn | 36 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 28 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle_common.gypi | 4 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle_nacl.gyp | 24 |
7 files changed, 10 insertions, 88 deletions
@@ -215,7 +215,7 @@ deps = { Var('chromium_git') + '/native_client/src/third_party/scons-2.0.1.git' + '@' + '1c1550e17fc26355d08627fbdec13d8291227067', 'src/third_party/webrtc': - Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + 'f74969583da0c4ea4e42ca7dc9f9e6cd40c5459a', # commit position 11835 + Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + '5ec62447c25be94a13feaf77c5e331ff91607742', # commit position 11842 'src/third_party/openmax_dl': Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'), diff --git a/remoting/protocol/ice_transport_channel.cc b/remoting/protocol/ice_transport_channel.cc index bc07953..da7a5cf 100644 --- a/remoting/protocol/ice_transport_channel.cc +++ b/remoting/protocol/ice_transport_channel.cc @@ -17,7 +17,7 @@ #include "remoting/protocol/port_allocator_factory.h" #include "remoting/protocol/transport_context.h" #include "third_party/webrtc/base/network.h" -#include "third_party/webrtc/p2p/base/constants.h" +#include "third_party/webrtc/p2p/base/p2pconstants.h" #include "third_party/webrtc/p2p/base/p2ptransportchannel.h" #include "third_party/webrtc/p2p/base/port.h" #include "third_party/webrtc/p2p/client/httpportallocator.h" diff --git a/remoting/remoting_nacl.gyp b/remoting/remoting_nacl.gyp index d66a996..09b9425 100644 --- a/remoting/remoting_nacl.gyp +++ b/remoting/remoting_nacl.gyp @@ -157,7 +157,6 @@ '>(tc_lib_dir_pnacl_newlib)/libicui18n_nacl.a', '>(tc_lib_dir_pnacl_newlib)/libicuuc_nacl.a', '>(tc_lib_dir_pnacl_newlib)/libjingle_nacl.a', - '>(tc_lib_dir_pnacl_newlib)/libjingle_p2p_constants_nacl.a', '>(tc_lib_dir_pnacl_newlib)/libmodp_b64_nacl.a', '>(tc_lib_dir_pnacl_newlib)/libboringssl_nacl.a', '>(tc_lib_dir_pnacl_newlib)/libopus_nacl.a', @@ -215,7 +214,6 @@ '-lremoting_webrtc_nacl', '-lyuv_nacl', '-lvpx_nacl', - '-ljingle_p2p_constants_nacl', '-ljingle_nacl', '-lexpat_nacl', '-lmodp_b64_nacl', diff --git a/third_party/libjingle/BUILD.gn b/third_party/libjingle/BUILD.gn index 6174810..1c3e5f9 100644 --- a/third_party/libjingle/BUILD.gn +++ b/third_party/libjingle/BUILD.gn @@ -127,11 +127,11 @@ static_library("libjingle") { "$p2p_dir/base/basicpacketsocketfactory.h", "$p2p_dir/base/candidate.h", "$p2p_dir/base/common.h", - "$p2p_dir/base/constants.cc", - "$p2p_dir/base/constants.h", "$p2p_dir/base/dtlstransport.h", "$p2p_dir/base/dtlstransportchannel.cc", "$p2p_dir/base/dtlstransportchannel.h", + "$p2p_dir/base/p2pconstants.cc", + "$p2p_dir/base/p2pconstants.h", "$p2p_dir/base/p2ptransport.cc", "$p2p_dir/base/p2ptransport.h", "$p2p_dir/base/p2ptransportchannel.cc", @@ -220,11 +220,6 @@ static_library("libjingle") { "$xmpp_dir/xmpptask.cc", "$xmpp_dir/xmpptask.h", ] - sources -= [ - # Compiled as part of libjingle_p2p_constants. - "$p2p_dir/base/constants.cc", - "$p2p_dir/base/constants.h", - ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] @@ -233,7 +228,6 @@ static_library("libjingle") { ":jingle_deps", ] deps = [ - ":libjingle_p2p_constants", "//third_party/webrtc/base:rtc_base", ] @@ -257,28 +251,6 @@ static_library("libjingle") { public_configs = [ ":jingle_public_configs" ] } -# This has to be is a separate project due to a bug in MSVS 2008 and the -# current toolset on android. The problem is that we have two files named -# "constants.cc" and MSVS/android doesn't handle this properly. -# GYP currently has guards to catch this, so if you want to remove it, -# run GYP and if GYP has removed the validation check, then we can assume -# that the toolchains have been fixed (we currently use VS2010 and later, -# so VS2008 isn't a concern anymore). -# -# GYP version: third_party/libjingle.gyp:libjingle_p2p_constants -static_library("libjingle_p2p_constants") { - p2p_dir = "../webrtc/p2p" - sources = [ - "$p2p_dir/base/constants.cc", - "$p2p_dir/base/constants.h", - ] - public_deps = [ - ":jingle_deps", - ] - configs += [ ":jingle_unexported_configs" ] - public_configs = [ ":jingle_public_configs" ] -} - if (enable_webrtc) { source_set("libjingle_webrtc") { sources = [ @@ -373,11 +345,11 @@ if (enable_webrtc) { "../webrtc/media/base/capturerenderadapter.h", "../webrtc/media/base/codec.cc", "../webrtc/media/base/codec.h", - "../webrtc/media/base/constants.cc", - "../webrtc/media/base/constants.h", "../webrtc/media/base/cryptoparams.h", "../webrtc/media/base/hybriddataengine.h", "../webrtc/media/base/mediachannel.h", + "../webrtc/media/base/mediaconstants.cc", + "../webrtc/media/base/mediaconstants.h", "../webrtc/media/base/mediaengine.cc", "../webrtc/media/base/mediaengine.h", "../webrtc/media/base/rtpdataengine.cc", diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 3793064..6edf17f 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -10,7 +10,6 @@ 'libjingle_additional_deps%': [], 'libjingle_peerconnection_additional_deps%': [], 'libjingle_source%': "source", - 'webrtc_p2p': "../webrtc/p2p", 'webrtc_xmpp': "../webrtc/libjingle/xmpp", }, # Most of these settings have been split according to their scope into @@ -217,35 +216,12 @@ 'target_name': 'libjingle', 'type': 'static_library', 'includes': [ 'libjingle_common.gypi' ], - 'sources!' : [ - # Compiled as part of libjingle_p2p_constants. - '<(webrtc_p2p)/base/constants.cc', - '<(webrtc_p2p)/base/constants.h', - ], 'dependencies': [ '<(DEPTH)/third_party/webrtc/base/base.gyp:rtc_base', '<(DEPTH)/third_party/webrtc/libjingle/xmllite/xmllite.gyp:rtc_xmllite', - 'libjingle_p2p_constants', '<@(libjingle_additional_deps)', ], }, # target libjingle - # This has to be is a separate project due to a bug in MSVS 2008 and the - # current toolset on android. The problem is that we have two files named - # "constants.cc" and MSVS/android doesn't handle this properly. - # GYP currently has guards to catch this, so if you want to remove it, - # run GYP and if GYP has removed the validation check, then we can assume - # that the toolchains have been fixed (we currently use VS2010 and later, - # so VS2008 isn't a concern anymore). - # - # GN version: //third_party/libjingle:libjingle_p2p_constants - { - 'target_name': 'libjingle_p2p_constants', - 'type': 'static_library', - 'sources': [ - '<(webrtc_p2p)/base/constants.cc', - '<(webrtc_p2p)/base/constants.h', - ], - }, # target libjingle_p2p_constants ], 'conditions': [ ['enable_webrtc==1', { @@ -334,11 +310,11 @@ '<(DEPTH)/third_party/webrtc/media/base/capturerenderadapter.h', '<(DEPTH)/third_party/webrtc/media/base/codec.cc', '<(DEPTH)/third_party/webrtc/media/base/codec.h', - '<(DEPTH)/third_party/webrtc/media/base/constants.cc', - '<(DEPTH)/third_party/webrtc/media/base/constants.h', '<(DEPTH)/third_party/webrtc/media/base/cryptoparams.h', '<(DEPTH)/third_party/webrtc/media/base/hybriddataengine.h', '<(DEPTH)/third_party/webrtc/media/base/mediachannel.h', + '<(DEPTH)/third_party/webrtc/media/base/mediaconstants.cc', + '<(DEPTH)/third_party/webrtc/media/base/mediaconstants.h', '<(DEPTH)/third_party/webrtc/media/base/mediaengine.cc', '<(DEPTH)/third_party/webrtc/media/base/mediaengine.h', '<(DEPTH)/third_party/webrtc/media/base/rtpdataengine.cc', diff --git a/third_party/libjingle/libjingle_common.gypi b/third_party/libjingle/libjingle_common.gypi index 9b43115..9930f1e 100644 --- a/third_party/libjingle/libjingle_common.gypi +++ b/third_party/libjingle/libjingle_common.gypi @@ -16,11 +16,11 @@ '<(webrtc_p2p)/base/basicpacketsocketfactory.h', '<(webrtc_p2p)/base/candidate.h', '<(webrtc_p2p)/base/common.h', - '<(webrtc_p2p)/base/constants.cc', - '<(webrtc_p2p)/base/constants.h', '<(webrtc_p2p)/base/dtlstransport.h', '<(webrtc_p2p)/base/dtlstransportchannel.cc', '<(webrtc_p2p)/base/dtlstransportchannel.h', + '<(webrtc_p2p)/base/p2pconstants.cc', + '<(webrtc_p2p)/base/p2pconstants.h', '<(webrtc_p2p)/base/p2ptransport.cc', '<(webrtc_p2p)/base/p2ptransport.h', '<(webrtc_p2p)/base/p2ptransportchannel.cc', diff --git a/third_party/libjingle/libjingle_nacl.gyp b/third_party/libjingle/libjingle_nacl.gyp index 9fb677a..81742ba 100644 --- a/third_party/libjingle/libjingle_nacl.gyp +++ b/third_party/libjingle/libjingle_nacl.gyp @@ -29,7 +29,6 @@ '<(DEPTH)/native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted', '<(DEPTH)/third_party/expat/expat_nacl.gyp:expat_nacl', '<(DEPTH)/third_party/boringssl/boringssl_nacl.gyp:boringssl_nacl', - 'libjingle_p2p_constants_nacl', ], 'defines': [ 'EXPAT_RELATIVE_PATH', @@ -253,9 +252,6 @@ '<(webrtc_system_wrappers)/source/field_trial_default.cc', ], 'sources!': [ - # Compiled as part of libjingle_p2p_constants_nacl. - '<(webrtc_p2p)/base/constants.cc', - '<(webrtc_p2p)/base/constants.h', # For NACL, we have the field_trial_default and don't need the # field_trail.cc. 'overrides/field_trial.cc', @@ -295,25 +291,5 @@ '<(DEPTH)/native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted', ], }, # end of target 'libjingle_nacl' - - { - 'target_name': 'libjingle_p2p_constants_nacl', - 'type': 'none', - 'variables': { - 'nlib_target': 'libjingle_p2p_constants_nacl.a', - 'nacl_untrusted_build': 1, - 'build_glibc': 0, - 'build_newlib': 1, - 'build_pnacl_newlib': 1, - }, - 'include_dirs': [ - './<(libjingle_source)', - '../' - ], - 'sources': [ - '<(webrtc_p2p)/base/constants.cc', - '<(webrtc_p2p)/base/constants.h', - ], - }, # end of target 'libjingle_p2p_constants_nacl' ], } |