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

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

Issue 2794943002: Delete MediaController class, move Call ownership to PeerConnection. (Closed)
Patch Set: Revert DCHECK addition. Created 3 years, 7 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
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("../webrtc.gni") 9 import("../webrtc.gni")
10 if (is_android) { 10 if (is_android) {
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 "datachannel.cc", 88 "datachannel.cc",
89 "datachannel.h", 89 "datachannel.h",
90 "dtmfsender.cc", 90 "dtmfsender.cc",
91 "dtmfsender.h", 91 "dtmfsender.h",
92 "iceserverparsing.cc", 92 "iceserverparsing.cc",
93 "iceserverparsing.h", 93 "iceserverparsing.h",
94 "jsepicecandidate.cc", 94 "jsepicecandidate.cc",
95 "jsepsessiondescription.cc", 95 "jsepsessiondescription.cc",
96 "localaudiosource.cc", 96 "localaudiosource.cc",
97 "localaudiosource.h", 97 "localaudiosource.h",
98 "mediacontroller.cc",
99 "mediacontroller.h",
100 "mediastream.cc", 98 "mediastream.cc",
101 "mediastream.h", 99 "mediastream.h",
102 "mediastreamobserver.cc", 100 "mediastreamobserver.cc",
103 "mediastreamobserver.h", 101 "mediastreamobserver.h",
104 "mediastreamtrack.h", 102 "mediastreamtrack.h",
105 "peerconnection.cc", 103 "peerconnection.cc",
106 "peerconnection.h", 104 "peerconnection.h",
107 "peerconnectionfactory.cc", 105 "peerconnectionfactory.cc",
108 "peerconnectionfactory.h", 106 "peerconnectionfactory.h",
109 "remoteaudiosource.cc", 107 "remoteaudiosource.cc",
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 cflags = [ "-Wno-sign-compare" ] 274 cflags = [ "-Wno-sign-compare" ]
277 } 275 }
278 } 276 }
279 277
280 rtc_test("peerconnection_unittests") { 278 rtc_test("peerconnection_unittests") {
281 check_includes = false # TODO(kjellander): Remove (bugs.webrtc.org/6828) 279 check_includes = false # TODO(kjellander): Remove (bugs.webrtc.org/6828)
282 testonly = true 280 testonly = true
283 sources = [ 281 sources = [
284 "datachannel_unittest.cc", 282 "datachannel_unittest.cc",
285 "dtmfsender_unittest.cc", 283 "dtmfsender_unittest.cc",
286 "fakemediacontroller.h",
287 "iceserverparsing_unittest.cc", 284 "iceserverparsing_unittest.cc",
288 "jsepsessiondescription_unittest.cc", 285 "jsepsessiondescription_unittest.cc",
289 "localaudiosource_unittest.cc", 286 "localaudiosource_unittest.cc",
290 "mediaconstraintsinterface_unittest.cc", 287 "mediaconstraintsinterface_unittest.cc",
291 "mediastream_unittest.cc", 288 "mediastream_unittest.cc",
292 "peerconnection_integrationtest.cc", 289 "peerconnection_integrationtest.cc",
293 "peerconnectionendtoend_unittest.cc", 290 "peerconnectionendtoend_unittest.cc",
294 "peerconnectionfactory_unittest.cc", 291 "peerconnectionfactory_unittest.cc",
295 "peerconnectioninterface_unittest.cc", 292 "peerconnectioninterface_unittest.cc",
296 "proxy_unittest.cc", 293 "proxy_unittest.cc",
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 "//testing/gmock", 362 "//testing/gmock",
366 ] 363 ]
367 364
368 if (is_android) { 365 if (is_android) {
369 deps += [ "//testing/android/native_test:native_test_support" ] 366 deps += [ "//testing/android/native_test:native_test_support" ]
370 367
371 shard_timeout = 900 368 shard_timeout = 900
372 } 369 }
373 } 370 }
374 } 371 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698