Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2015 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/webrtc.gni") | 9 import("../build/webrtc.gni") |
| 10 if (is_android) { | 10 if (is_android) { |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 77 "peerconnection.cc", | 77 "peerconnection.cc", |
| 78 "peerconnection.h", | 78 "peerconnection.h", |
| 79 "peerconnectionfactory.cc", | 79 "peerconnectionfactory.cc", |
| 80 "peerconnectionfactory.h", | 80 "peerconnectionfactory.h", |
| 81 "peerconnectionfactoryproxy.h", | 81 "peerconnectionfactoryproxy.h", |
| 82 "peerconnectioninterface.h", | 82 "peerconnectioninterface.h", |
| 83 "peerconnectionproxy.h", | 83 "peerconnectionproxy.h", |
| 84 "proxy.h", | 84 "proxy.h", |
| 85 "remoteaudiosource.cc", | 85 "remoteaudiosource.cc", |
| 86 "remoteaudiosource.h", | 86 "remoteaudiosource.h", |
| 87 "rtcstats.h", | 87 "rtcstatscollector.cc", |
| 88 "rtcstats_objects.h", | 88 "rtcstatscollector.h", |
| 89 "rtcstatsreport.h", | |
| 90 "rtpparameters.h", | 89 "rtpparameters.h", |
| 91 "rtpreceiver.cc", | 90 "rtpreceiver.cc", |
| 92 "rtpreceiver.h", | 91 "rtpreceiver.h", |
| 93 "rtpreceiverinterface.h", | 92 "rtpreceiverinterface.h", |
| 94 "rtpsender.cc", | 93 "rtpsender.cc", |
| 95 "rtpsender.h", | 94 "rtpsender.h", |
| 96 "rtpsenderinterface.h", | 95 "rtpsenderinterface.h", |
| 97 "sctputils.cc", | 96 "sctputils.cc", |
| 98 "sctputils.h", | 97 "sctputils.h", |
| 99 "statscollector.cc", | 98 "statscollector.cc", |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 121 if (is_clang) { | 120 if (is_clang) { |
| 122 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 121 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 123 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 122 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 124 } | 123 } |
| 125 | 124 |
| 126 deps = [ | 125 deps = [ |
| 127 ":call_api", | 126 ":call_api", |
| 128 "../call", | 127 "../call", |
| 129 "../media", | 128 "../media", |
| 130 "../pc", | 129 "../pc", |
| 130 "../stats", | |
| 131 ] | 131 ] |
| 132 | 132 |
| 133 if (rtc_use_quic) { | 133 if (rtc_use_quic) { |
| 134 sources += [ | 134 sources += [ |
| 135 "quicdatachannel.cc", | 135 "quicdatachannel.cc", |
| 136 "quicdatachannel.h", | 136 "quicdatachannel.h", |
| 137 "quicdatatransport.cc", | 137 "quicdatatransport.cc", |
| 138 "quicdatatransport.h", | 138 "quicdatatransport.h", |
| 139 ] | 139 ] |
| 140 deps += [ "//third_party/libquic" ] | 140 deps += [ "//third_party/libquic" ] |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 291 "android/java/src/org/webrtc/VideoSource.java", | 291 "android/java/src/org/webrtc/VideoSource.java", |
| 292 "android/java/src/org/webrtc/VideoTrack.java", | 292 "android/java/src/org/webrtc/VideoTrack.java", |
| 293 ] | 293 ] |
| 294 | 294 |
| 295 deps = [ | 295 deps = [ |
| 296 "//webrtc/base:base_java", | 296 "//webrtc/base:base_java", |
| 297 ] | 297 ] |
| 298 } | 298 } |
| 299 } | 299 } |
| 300 | 300 |
| 301 # GYP version: webrtc/api/api.gyp:rtc_stats_api | |
| 302 rtc_source_set("rtc_stats_api") { | |
| 303 cflags = [] | |
| 304 sources = [ | |
| 305 "stats/rtcstats.h", | |
| 306 "stats/rtcstats_objects.h", | |
| 307 "stats/rtcstatsreport.h", | |
| 308 ] | |
| 309 | |
| 310 if (is_clang) { | |
| 311 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | |
| 312 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | |
|
kjellander_webrtc
2016/09/14 13:55:27
For new code, I won't tolerate violating these exc
hbos
2016/09/14 18:48:03
Removed. It's not necessary in the header target,
kjellander_webrtc
2016/09/15 10:16:37
Acknowledged.
| |
| 313 } | |
| 314 | |
| 315 deps = [ | |
| 316 "../base:rtc_base_approved", | |
| 317 ] | |
| 318 } | |
| 319 | |
| 301 if (rtc_include_tests) { | 320 if (rtc_include_tests) { |
| 302 config("peerconnection_unittests_config") { | 321 config("peerconnection_unittests_config") { |
| 303 # The warnings below are enabled by default. Since GN orders compiler flags | 322 # The warnings below are enabled by default. Since GN orders compiler flags |
| 304 # for a target before flags from configs, the only way to disable such | 323 # for a target before flags from configs, the only way to disable such |
| 305 # warnings is by having them in a separate config, loaded from the target. | 324 # warnings is by having them in a separate config, loaded from the target. |
| 306 # TODO(kjellander): Make the code compile without disabling these flags. | 325 # TODO(kjellander): Make the code compile without disabling these flags. |
| 307 # See https://bugs.webrtc.org/3307. | 326 # See https://bugs.webrtc.org/3307. |
| 308 if (is_clang && is_win) { | 327 if (is_clang && is_win) { |
| 309 cflags = [ | 328 cflags = [ |
| 310 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6267 | 329 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6267 |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 329 "fakemetricsobserver.h", | 348 "fakemetricsobserver.h", |
| 330 "jsepsessiondescription_unittest.cc", | 349 "jsepsessiondescription_unittest.cc", |
| 331 "localaudiosource_unittest.cc", | 350 "localaudiosource_unittest.cc", |
| 332 "mediaconstraintsinterface_unittest.cc", | 351 "mediaconstraintsinterface_unittest.cc", |
| 333 "mediastream_unittest.cc", | 352 "mediastream_unittest.cc", |
| 334 "peerconnection_unittest.cc", | 353 "peerconnection_unittest.cc", |
| 335 "peerconnectionendtoend_unittest.cc", | 354 "peerconnectionendtoend_unittest.cc", |
| 336 "peerconnectionfactory_unittest.cc", | 355 "peerconnectionfactory_unittest.cc", |
| 337 "peerconnectioninterface_unittest.cc", | 356 "peerconnectioninterface_unittest.cc", |
| 338 "proxy_unittest.cc", | 357 "proxy_unittest.cc", |
| 358 "rtcstatscollector_unittest.cc", | |
|
kjellander_webrtc
2016/09/14 13:55:27
nit: sort alphabetically.
hbos
2016/09/14 18:48:03
It is sorted.
kjellander_webrtc
2016/09/15 10:16:37
Sorry, I misread rtc/rtp :P
| |
| 339 "rtpsenderreceiver_unittest.cc", | 359 "rtpsenderreceiver_unittest.cc", |
| 340 "statscollector_unittest.cc", | 360 "statscollector_unittest.cc", |
| 341 "test/fakeaudiocapturemodule.cc", | 361 "test/fakeaudiocapturemodule.cc", |
| 342 "test/fakeaudiocapturemodule.h", | 362 "test/fakeaudiocapturemodule.h", |
| 343 "test/fakeaudiocapturemodule_unittest.cc", | 363 "test/fakeaudiocapturemodule_unittest.cc", |
| 344 "test/fakeconstraints.h", | 364 "test/fakeconstraints.h", |
| 345 "test/fakedatachannelprovider.h", | 365 "test/fakedatachannelprovider.h", |
| 346 "test/fakeperiodicvideocapturer.h", | 366 "test/fakeperiodicvideocapturer.h", |
| 347 "test/fakertccertificategenerator.h", | 367 "test/fakertccertificategenerator.h", |
| 348 "test/fakevideotrackrenderer.h", | 368 "test/fakevideotrackrenderer.h", |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 446 | 466 |
| 447 shared_libraries = [ ":libjingle_peerconnection_so" ] | 467 shared_libraries = [ ":libjingle_peerconnection_so" ] |
| 448 } | 468 } |
| 449 | 469 |
| 450 android_resources("libjingle_peerconnection_android_unittest_resources") { | 470 android_resources("libjingle_peerconnection_android_unittest_resources") { |
| 451 resource_dirs = [ "androidtests/res" ] | 471 resource_dirs = [ "androidtests/res" ] |
| 452 custom_package = "org.webrtc" | 472 custom_package = "org.webrtc" |
| 453 } | 473 } |
| 454 } | 474 } |
| 455 } | 475 } |
| OLD | NEW |