Chromium Code Reviews| OLD | NEW | 
|---|---|
| 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2014 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 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. | 9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. | 
| 10 | 10 | 
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 222 | 222 | 
| 223 config("common_objc") { | 223 config("common_objc") { | 
| 224 libs = [ "Foundation.framework" ] | 224 libs = [ "Foundation.framework" ] | 
| 225 } | 225 } | 
| 226 | 226 | 
| 227 rtc_source_set("video_stream_api") { | 227 rtc_source_set("video_stream_api") { | 
| 228 sources = [ | 228 sources = [ | 
| 229 "video_receive_stream.h", | 229 "video_receive_stream.h", | 
| 230 "video_send_stream.h", | 230 "video_send_stream.h", | 
| 231 ] | 231 ] | 
| 232 deps = [ | |
| 233 ":webrtc_common", | |
| 234 "api:transport_api", | |
| 235 "base:rtc_base_approved", | |
| 236 "common_video:common_video", | |
| 237 ] | |
| 232 } | 238 } | 
| 233 | 239 | 
| 234 # Contents of video_frame.h is moved from top-level down to common_video/. | 240 # Contents of video_frame.h is moved from top-level down to common_video/. | 
| 235 # Nothing in webrtc includes the backwards-compatibility header, so this target | 241 # Nothing in webrtc includes the backwards-compatibility header, so this target | 
| 236 # is only for completeness. | 242 # is only for completeness. | 
| 237 # TODO(nisse): Delete together with the header file once downstream applications | 243 # TODO(nisse): Delete together with the header file once downstream applications | 
| 238 # no longer use it. | 244 # no longer use it. | 
| 239 rtc_source_set("video_frame_deprecated") { | 245 rtc_source_set("video_frame_deprecated") { | 
| 240 sources = [ | 246 sources = [ | 
| 241 "video_frame.h", | 247 "video_frame.h", | 
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 342 deps += [ | 348 deps += [ | 
| 343 "audio:low_bandwidth_audio_test", | 349 "audio:low_bandwidth_audio_test", | 
| 344 "logging:rtc_event_log2rtp_dump", | 350 "logging:rtc_event_log2rtp_dump", | 
| 345 ] | 351 ] | 
| 346 } | 352 } | 
| 347 } | 353 } | 
| 348 } | 354 } | 
| 349 } | 355 } | 
| 350 | 356 | 
| 351 rtc_static_library("webrtc_common") { | 357 rtc_static_library("webrtc_common") { | 
| 358 # TODO(mbonadei): Remove (bugs.webrtc.org/7745) | |
| 359 # Enabling GN check triggers cyclic dependency error: | |
| 360 # //webrtc:webrtc_common -> | |
| 361 # //webrtc/api:video_frame_api -> | |
| 362 # //webrtc/system_wrappers:system_wrappers -> | |
| 363 # //webrtc:webrtc_common | |
| 364 check_includes = false | |
| 352 sources = [ | 365 sources = [ | 
| 353 "common_types.cc", | 366 "common_types.cc", | 
| 354 "common_types.h", | 367 "common_types.h", | 
| 355 "config.cc", | 368 "config.cc", | 
| 356 "config.h", | 369 "config.h", | 
| 357 "typedefs.h", | 370 "typedefs.h", | 
| 358 ] | 371 ] | 
| 359 | 372 | 
| 360 if (!build_with_chromium && is_clang) { | 373 if (!build_with_chromium && is_clang) { | 
| 361 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 374 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 
| 362 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 375 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| 363 } | 376 } | 
| 377 deps = [ | |
| 378 "base:rtc_base_approved", | |
| 
 
kjellander_webrtc
2017/06/01 13:39:01
Since we have the check disabled, don't you think
 
mbonadei
2017/06/01 13:44:30
I don't know... It is still an improvement respect
 
kjellander_webrtc
2017/06/01 14:01:17
I'm just thinking that since it's something that s
 
mbonadei
2017/06/01 19:08:48
I am a little bit confused. It is a real dependenc
 
kjellander_webrtc
2017/06/01 19:45:17
Leaving it in fine. I just thought we were about t
 
mbonadei
2017/06/01 19:55:58
Ah ok, now I got it. I was missing that webrtc:587
 
 | |
| 379 ] | |
| 364 } | 380 } | 
| 365 | 381 | 
| 366 if (use_libfuzzer || use_drfuzz || use_afl) { | 382 if (use_libfuzzer || use_drfuzz || use_afl) { | 
| 367 # This target is only here for gn to discover fuzzer build targets under | 383 # This target is only here for gn to discover fuzzer build targets under | 
| 368 # webrtc/test/fuzzers/. | 384 # webrtc/test/fuzzers/. | 
| 369 group("webrtc_fuzzers_dummy") { | 385 group("webrtc_fuzzers_dummy") { | 
| 370 testonly = true | 386 testonly = true | 
| 371 deps = [ | 387 deps = [ | 
| 372 "test/fuzzers:webrtc_fuzzer_main", | 388 "test/fuzzers:webrtc_fuzzer_main", | 
| 373 ] | 389 ] | 
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 529 ] | 545 ] | 
| 530 | 546 | 
| 531 deps = [ | 547 deps = [ | 
| 532 "//base:base_java_test_support", | 548 "//base:base_java_test_support", | 
| 533 "//webrtc/examples:AppRTCMobile_javalib", | 549 "//webrtc/examples:AppRTCMobile_javalib", | 
| 534 "//webrtc/sdk/android:libjingle_peerconnection_java", | 550 "//webrtc/sdk/android:libjingle_peerconnection_java", | 
| 535 ] | 551 ] | 
| 536 } | 552 } | 
| 537 } | 553 } | 
| 538 } | 554 } | 
| OLD | NEW |