| 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 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 309 } else { | 309 } else { |
| 310 deps += [ "modules/video_capture:video_capture_tests" ] | 310 deps += [ "modules/video_capture:video_capture_tests" ] |
| 311 } | 311 } |
| 312 if (!is_ios) { | 312 if (!is_ios) { |
| 313 deps += [ | 313 deps += [ |
| 314 "modules/audio_device:audio_device_tests", | 314 "modules/audio_device:audio_device_tests", |
| 315 "voice_engine:voe_auto_test", | 315 "voice_engine:voe_auto_test", |
| 316 ] | 316 ] |
| 317 } | 317 } |
| 318 if (rtc_enable_protobuf) { | 318 if (rtc_enable_protobuf) { |
| 319 deps += [ "logging:rtc_event_log2rtp_dump" ] | 319 deps += [ |
| 320 "audio:low_bandwidth_audio_test", |
| 321 "logging:rtc_event_log2rtp_dump", |
| 322 ] |
| 320 } | 323 } |
| 321 } | 324 } |
| 322 } | 325 } |
| 323 } | 326 } |
| 324 | 327 |
| 325 rtc_static_library("webrtc_common") { | 328 rtc_static_library("webrtc_common") { |
| 326 sources = [ | 329 sources = [ |
| 327 "common_types.cc", | 330 "common_types.cc", |
| 328 "common_types.h", | 331 "common_types.h", |
| 329 "config.cc", | 332 "config.cc", |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 501 ] | 504 ] |
| 502 | 505 |
| 503 deps = [ | 506 deps = [ |
| 504 "//base:base_java_test_support", | 507 "//base:base_java_test_support", |
| 505 "//webrtc/examples:AppRTCMobile_javalib", | 508 "//webrtc/examples:AppRTCMobile_javalib", |
| 506 "//webrtc/sdk/android:libjingle_peerconnection_java", | 509 "//webrtc/sdk/android:libjingle_peerconnection_java", |
| 507 ] | 510 ] |
| 508 } | 511 } |
| 509 } | 512 } |
| 510 } | 513 } |
| OLD | NEW |