Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side Diff: webrtc/media/BUILD.gn

Issue 2614813003: Revert of Separating SCTP code from BaseChannel/MediaChannel. (Closed)
Patch Set: Also reverting https://codereview.webrtc.org/2612963002 Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/api/webrtcsessiondescriptionfactory.cc ('k') | webrtc/media/base/fakemediaengine.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 import("//build/config/linux/pkg_config.gni") 9 import("//build/config/linux/pkg_config.gni")
10 import("../build/webrtc.gni") 10 import("../build/webrtc.gni")
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 libs = [] 47 libs = []
48 deps = [] 48 deps = []
49 sources = [ 49 sources = [
50 "base/adaptedvideotracksource.cc", 50 "base/adaptedvideotracksource.cc",
51 "base/adaptedvideotracksource.h", 51 "base/adaptedvideotracksource.h",
52 "base/audiosource.h", 52 "base/audiosource.h",
53 "base/codec.cc", 53 "base/codec.cc",
54 "base/codec.h", 54 "base/codec.h",
55 "base/cryptoparams.h", 55 "base/cryptoparams.h",
56 "base/device.h", 56 "base/device.h",
57 "base/hybriddataengine.h",
57 "base/mediachannel.h", 58 "base/mediachannel.h",
58 "base/mediaconstants.cc", 59 "base/mediaconstants.cc",
59 "base/mediaconstants.h", 60 "base/mediaconstants.h",
60 "base/mediaengine.cc", 61 "base/mediaengine.cc",
61 "base/mediaengine.h", 62 "base/mediaengine.h",
62 "base/rtpdataengine.cc", 63 "base/rtpdataengine.cc",
63 "base/rtpdataengine.h", 64 "base/rtpdataengine.h",
64 "base/rtpdump.cc", 65 "base/rtpdump.cc",
65 "base/rtpdump.h", 66 "base/rtpdump.h",
66 "base/rtputils.cc", 67 "base/rtputils.cc",
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 "engine/webrtcvideocapturerfactory.h", 136 "engine/webrtcvideocapturerfactory.h",
136 "engine/webrtcvideodecoderfactory.h", 137 "engine/webrtcvideodecoderfactory.h",
137 "engine/webrtcvideoencoderfactory.cc", 138 "engine/webrtcvideoencoderfactory.cc",
138 "engine/webrtcvideoencoderfactory.h", 139 "engine/webrtcvideoencoderfactory.h",
139 "engine/webrtcvideoengine2.cc", 140 "engine/webrtcvideoengine2.cc",
140 "engine/webrtcvideoengine2.h", 141 "engine/webrtcvideoengine2.h",
141 "engine/webrtcvideoframe.h", 142 "engine/webrtcvideoframe.h",
142 "engine/webrtcvoe.h", 143 "engine/webrtcvoe.h",
143 "engine/webrtcvoiceengine.cc", 144 "engine/webrtcvoiceengine.cc",
144 "engine/webrtcvoiceengine.h", 145 "engine/webrtcvoiceengine.h",
145 "sctp/sctptransportinternal.h",
146 ] 146 ]
147 147
148 if (rtc_enable_sctp) { 148 if (rtc_enable_sctp) {
149 sources += [ 149 sources += [
150 "sctp/sctptransport.cc", 150 "sctp/sctpdataengine.cc",
151 "sctp/sctptransport.h", 151 "sctp/sctpdataengine.h",
152 ] 152 ]
153 } 153 }
154 154
155 configs += [ ":rtc_media_warnings_config" ] 155 configs += [ ":rtc_media_warnings_config" ]
156 156
157 if (!build_with_chromium && is_clang) { 157 if (!build_with_chromium && is_clang) {
158 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). 158 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
159 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] 159 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
160 } 160 }
161 161
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 "engine/simulcast_unittest.cc", 339 "engine/simulcast_unittest.cc",
340 "engine/videodecodersoftwarefallbackwrapper_unittest.cc", 340 "engine/videodecodersoftwarefallbackwrapper_unittest.cc",
341 "engine/videoencodersoftwarefallbackwrapper_unittest.cc", 341 "engine/videoencodersoftwarefallbackwrapper_unittest.cc",
342 "engine/webrtcmediaengine_unittest.cc", 342 "engine/webrtcmediaengine_unittest.cc",
343 "engine/webrtcvideocapturer_unittest.cc", 343 "engine/webrtcvideocapturer_unittest.cc",
344 "engine/webrtcvideoengine2_unittest.cc", 344 "engine/webrtcvideoengine2_unittest.cc",
345 "engine/webrtcvoiceengine_unittest.cc", 345 "engine/webrtcvoiceengine_unittest.cc",
346 ] 346 ]
347 347
348 if (rtc_enable_sctp) { 348 if (rtc_enable_sctp) {
349 sources += [ "sctp/sctptransport_unittest.cc" ] 349 sources += [ "sctp/sctpdataengine_unittest.cc" ]
350 } 350 }
351 351
352 configs += [ ":rtc_media_unittests_config" ] 352 configs += [ ":rtc_media_unittests_config" ]
353 353
354 if (rtc_use_h264) { 354 if (rtc_use_h264) {
355 defines += [ "WEBRTC_USE_H264" ] 355 defines += [ "WEBRTC_USE_H264" ]
356 } 356 }
357 if (is_win) { 357 if (is_win) {
358 cflags = [ 358 cflags = [
359 "/wd4245", # conversion from int to size_t, signed/unsigned mismatch. 359 "/wd4245", # conversion from int to size_t, signed/unsigned mismatch.
(...skipping 26 matching lines...) Expand all
386 # TODO(kjellander): Move as part of work in bugs.webrtc.org/4243. 386 # TODO(kjellander): Move as part of work in bugs.webrtc.org/4243.
387 ":rtc_media", 387 ":rtc_media",
388 ":rtc_unittest_main", 388 ":rtc_unittest_main",
389 "../audio", 389 "../audio",
390 "../base:rtc_base_tests_utils", 390 "../base:rtc_base_tests_utils",
391 "../modules/audio_device:mock_audio_device", 391 "../modules/audio_device:mock_audio_device",
392 "../system_wrappers:metrics_default", 392 "../system_wrappers:metrics_default",
393 ] 393 ]
394 } 394 }
395 } 395 }
OLDNEW
« no previous file with comments | « webrtc/api/webrtcsessiondescriptionfactory.cc ('k') | webrtc/media/base/fakemediaengine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698