Skip to content

GitLab

T
tangled
Commit fa750194 authored by kjellander's avatar kjellander Committed by Commit bot
Browse files
Options

Reland of move libpeerconnection target from third_party/libjingle (patchset... 

Reland of move libpeerconnection target from third_party/libjingle (patchset #1 id:1 of https://codereview.chromium.org/1834163002/ )

Reason for revert:
The config.h problem was addressed in https://codereview.webrtc.org/1820023004/ which was rolled in with https://codereview.chromium.org/1840133002/

Original issue's description:
> Revert of Remove libpeerconnection target from third_party/libjingle (patchset #4 id:60001 of https://codereview.chromium.org/1808233002/ )
>
> Reason for revert:
> Broke clang/win gn build (https://bugs.chromium.org/p/chromium/issues/detail?id=598316), as mentioned in the review thread in comment 24.
>
> Original issue's description:
> > Remove libpeerconnection target from third_party/libjingle
> >
> > All locations that depended on the target also depended on libjingle_webrtc,
> > which is where the sources of libpeerconnection were moved.
> >
> > BUG=webrtc:4256,481633
> >
> > Committed: https://crrev.com/696e62e66c1f1d2121f1451501d3066bf2f5ea4f
> > Cr-Commit-Position: refs/heads/master@{#383468}
>
> TBR=jochen@chromium.org,jam@chromium.org,sergeyu@chromium.org,tommi@chromium.org,kjellander@chromium.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:4256,481633
>
> Committed: https://crrev.com/8d484368f9d4013effeee0e078fbe7039254cd45
> Cr-Commit-Position: refs/heads/master@{#383490}

TBR=jochen@chromium.org,jam@chromium.org,sergeyu@chromium.org,tommi@chromium.org,thakis@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:4256,481633

Review URL: https://codereview.chromium.org/1839063005

Cr-Commit-Position: refs/heads/master@{#383913}
parent 150b7e56
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 80 deletions
content/browser/BUILD.gn
View file @ fa750194
......@@ -195,7 +195,6 @@ source_set("browser") {
deps += [
"//jingle:jingle_glue",
"//third_party/libjingle:libjingle_webrtc",
"//third_party/libjingle:libpeerconnection",
]
if (is_linux || is_mac || is_win) {
sources += [
......
content/content_renderer.gypi
View file @ fa750194
......@@ -841,7 +841,6 @@
['enable_webrtc==1', {
'dependencies': [
'../third_party/libjingle/libjingle.gyp:libjingle_webrtc',
'../third_party/libjingle/libjingle.gyp:libpeerconnection',
'../third_party/webrtc/modules/modules.gyp:audio_device',
'../third_party/webrtc/modules/modules.gyp:audio_processing',
'../third_party/webrtc/p2p/p2p.gyp:libstunprober',
......
content/content_tests.gypi
View file @ fa750194
......@@ -864,7 +864,7 @@
'../mojo/mojo_base.gyp:mojo_application_base',
'../mojo/mojo_edk.gyp:mojo_system_impl',
'../mojo/mojo_public.gyp:mojo_cpp_bindings',
'../net/net.gyp:net_test_support',
'../net/net.gyp:net_test_support',
'../ppapi/ppapi_internal.gyp:ppapi_host',
'../ppapi/ppapi_internal.gyp:ppapi_proxy',
'../ppapi/ppapi_internal.gyp:ppapi_shared',
......@@ -890,7 +890,7 @@
'../ui/surface/surface.gyp:surface',
'../url/url.gyp:url_lib',
'../v8/tools/gyp/v8.gyp:v8',
'browser/speech/proto/speech_proto.gyp:speech_proto',
'browser/speech/proto/speech_proto.gyp:speech_proto',
'content_test_mojo_bindings',
'content.gyp:content_app_both',
'content.gyp:content_browser',
......@@ -953,7 +953,6 @@
],
'dependencies': [
'../third_party/libjingle/libjingle.gyp:libjingle_webrtc',
'../third_party/libjingle/libjingle.gyp:libpeerconnection',
'../third_party/webrtc/modules/modules.gyp:video_capture_module',
],
}],
......@@ -1113,7 +1112,6 @@
'sources': [ '<@(content_unittests_webrtc_sources)' ],
'dependencies': [
'../third_party/libjingle/libjingle.gyp:libjingle_webrtc',
'../third_party/libjingle/libjingle.gyp:libpeerconnection',
'../third_party/webrtc/modules/modules.gyp:video_capture_module',
'../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
],
......
content/renderer/BUILD.gn
View file @ fa750194
......@@ -161,7 +161,6 @@ source_set("renderer") {
deps += [
"//crypto",
"//third_party/libjingle:libjingle_webrtc",
"//third_party/libjingle:libpeerconnection",
"//third_party/libjingle:libstunprober",
"//third_party/libvpx",
"//third_party/webrtc/base:rtc_base",
......
content/test/BUILD.gn
View file @ fa750194
......@@ -132,7 +132,6 @@ source_set("test_support") {
deps += [
"//third_party/libjingle:libjingle_webrtc",
"//third_party/libjingle:libpeerconnection",
"//third_party/webrtc/base:rtc_base",
"//third_party/webrtc/modules/video_capture",
]
......@@ -738,7 +737,6 @@ test("content_unittests") {
"//content")
deps += [
"//third_party/libjingle:libjingle_webrtc",
"//third_party/libjingle:libpeerconnection",
"//third_party/webrtc/base:rtc_base",
"//third_party/webrtc/modules/desktop_capture:primitives",
"//third_party/webrtc/modules/video_capture",
......
remoting/BUILD.gn
View file @ fa750194
......@@ -158,10 +158,7 @@ if (!is_mac) {
}
if (enable_webrtc) {
deps += [
"//third_party/libjingle:libjingle_webrtc",
"//third_party/libjingle:libpeerconnection",
]
deps += [ "//third_party/libjingle:libjingle_webrtc" ]
}
if (is_android) {
......
remoting/host/BUILD.gn
View file @ fa750194
......@@ -239,7 +239,7 @@ if (is_mac) { # TODO(GYP) Mac build of remoting host.
if (enable_webrtc) {
public_deps += [
"//third_party/libjingle:libpeerconnection",
"//third_party/libjingle:libjingle_webrtc",
"//third_party/webrtc/modules/desktop_capture",
]
}
......
remoting/protocol/BUILD.gn
View file @ fa750194
......@@ -39,13 +39,7 @@ source_set("protocol") {
"//remoting")
if (enable_webrtc) {
deps += [
# TODO(GYP): crbug.com/481633. We should probably not have to depend on
# libjingle_webrtc; that should be pulled in automatically by
# libpeerconnection instead.
"//third_party/libjingle:libjingle_webrtc",
"//third_party/libjingle:libpeerconnection",
]
deps += [ "//third_party/libjingle:libjingle_webrtc" ]
} else {
sources -= [
"webrtc_connection_to_client.cc",
......
remoting/remoting.gyp
View file @ fa750194
......@@ -253,7 +253,6 @@
['enable_webrtc == 1', {
'dependencies': [
'../third_party/libjingle/libjingle.gyp:libjingle_webrtc',
'../third_party/libjingle/libjingle.gyp:libpeerconnection',
],
}],
],
......
third_party/libjingle/BUILD.gn
View file @ fa750194
......@@ -369,12 +369,20 @@ if (enable_webrtc) {
"../webrtc/media/base/videoframefactory.h",
"../webrtc/media/base/videosourcebase.cc",
"../webrtc/media/base/videosourcebase.h",
"../webrtc/media/engine/simulcast.cc",
"../webrtc/media/engine/simulcast.h",
"../webrtc/media/engine/webrtccommon.h",
"../webrtc/media/engine/webrtcmediaengine.cc",
"../webrtc/media/engine/webrtcmediaengine.h",
"../webrtc/media/engine/webrtcvideoengine2.cc",
"../webrtc/media/engine/webrtcvideoengine2.h",
"../webrtc/media/engine/webrtcvideoframe.cc",
"../webrtc/media/engine/webrtcvideoframe.h",
"../webrtc/media/engine/webrtcvideoframefactory.cc",
"../webrtc/media/engine/webrtcvideoframefactory.h",
"../webrtc/media/engine/webrtcvoe.h",
"../webrtc/media/engine/webrtcvoiceengine.cc",
"../webrtc/media/engine/webrtcvoiceengine.h",
"../webrtc/pc/audiomonitor.cc",
"../webrtc/pc/audiomonitor.h",
"../webrtc/pc/bundlefilter.cc",
......@@ -408,9 +416,12 @@ if (enable_webrtc) {
deps = [
":libjingle",
"//third_party/libsrtp",
"//third_party/webrtc",
"//third_party/webrtc/modules/media_file",
"//third_party/webrtc/modules/video_capture",
"//third_party/webrtc/modules/video_render",
"//third_party/webrtc/system_wrappers",
"//third_party/webrtc/voice_engine",
]
if (!is_ios) {
......@@ -424,33 +435,6 @@ if (enable_webrtc) {
}
}
source_set("libpeerconnection") {
sources = [
"../webrtc/media/engine/simulcast.cc",
"../webrtc/media/engine/simulcast.h",
"../webrtc/media/engine/webrtcmediaengine.cc",
"../webrtc/media/engine/webrtcmediaengine.h",
"../webrtc/media/engine/webrtcvideoengine2.cc",
"../webrtc/media/engine/webrtcvideoengine2.h",
"../webrtc/media/engine/webrtcvoiceengine.cc",
"../webrtc/media/engine/webrtcvoiceengine.h",
]
configs += [ ":jingle_unexported_configs" ]
public_configs = [ ":jingle_public_configs" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
deps = [
# TODO(GYP): crbug.com/481633. Consider depending on :libjingle_webrtc
# instead.
":libjingle_webrtc_common",
"//third_party/webrtc",
"//third_party/webrtc/system_wrappers",
"//third_party/webrtc/voice_engine",
]
}
source_set("libstunprober") {
p2p_dir = "../webrtc/p2p"
sources = [
......
third_party/libjingle/libjingle.gyp
View file @ fa750194
......@@ -6,12 +6,6 @@
'includes': [
'../../build/win_precompile.gypi',
],
'variables': {
'libjingle_additional_deps%': [],
'libjingle_peerconnection_additional_deps%': [],
'libjingle_source%': "source",
'webrtc_xmpp': "../webrtc/libjingle/xmpp",
},
# Most of these settings have been split according to their scope into
# :jingle_unexported_configs and :jingle_public_config in the GN build.
'target_defaults': {
......@@ -36,7 +30,7 @@
'include_dirs': [
'./overrides',
'../../third_party/webrtc_overrides',
'./<(libjingle_source)',
'./source',
'../..',
'../../testing/gtest/include',
'../../third_party',
......@@ -57,7 +51,7 @@
'include_dirs': [
'../../third_party/webrtc_overrides',
'./overrides',
'./<(libjingle_source)',
'./source',
'../..',
'../../testing/gtest/include',
'../../third_party',
......@@ -220,7 +214,6 @@
'dependencies': [
'<(DEPTH)/third_party/webrtc/base/base.gyp:rtc_base',
'<(DEPTH)/third_party/webrtc/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
'<@(libjingle_additional_deps)',
],
}, # target libjingle
],
......@@ -335,12 +328,20 @@
'<(DEPTH)/third_party/webrtc/media/base/videoframefactory.h',
'<(DEPTH)/third_party/webrtc/media/base/videosourcebase.cc',
'<(DEPTH)/third_party/webrtc/media/base/videosourcebase.h',
'<(DEPTH)/third_party/webrtc/media/engine/simulcast.cc',
'<(DEPTH)/third_party/webrtc/media/engine/simulcast.h',
'<(DEPTH)/third_party/webrtc/media/engine/webrtccommon.h',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcmediaengine.cc',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcmediaengine.h',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoengine2.cc',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoengine2.h',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoframe.cc',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoframe.h',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoframefactory.cc',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoframefactory.h',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvoe.h',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvoiceengine.cc',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvoiceengine.h',
'<(DEPTH)/third_party/webrtc/media/sctp/sctpdataengine.cc',
'<(DEPTH)/third_party/webrtc/media/sctp/sctpdataengine.h',
'<(DEPTH)/third_party/webrtc/pc/audiomonitor.cc',
......@@ -372,6 +373,8 @@
'<(DEPTH)/third_party/webrtc/modules/modules.gyp:media_file',
'<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture',
'<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render',
'<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine',
'<(DEPTH)/third_party/webrtc/webrtc.gyp:webrtc',
'libjingle',
],
}, # target libjingle_webrtc_common
......@@ -388,28 +391,6 @@
'libjingle_webrtc_common',
],
},
{
# GN version: //third_party/libjingle:libpeerconnection
'target_name': 'libpeerconnection',
'type': 'static_library',
'sources': [
# Note: sources list duplicated in GN build.
'<(DEPTH)/third_party/webrtc/media/engine/simulcast.cc',
'<(DEPTH)/third_party/webrtc/media/engine/simulcast.h',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcmediaengine.cc',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcmediaengine.h',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoengine2.cc',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoengine2.h',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvoiceengine.cc',
'<(DEPTH)/third_party/webrtc/media/engine/webrtcvoiceengine.h',
],
'dependencies': [
'<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine',
'<(DEPTH)/third_party/webrtc/webrtc.gyp:webrtc',
'<@(libjingle_peerconnection_additional_deps)',
'libjingle_webrtc_common',
],
}, # target libpeerconnection
],
}],
],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment