| 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 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 315 ] | 315 ] |
| 316 } else { | 316 } else { |
| 317 deps += [ "modules/video_capture:video_capture_tests" ] | 317 deps += [ "modules/video_capture:video_capture_tests" ] |
| 318 } | 318 } |
| 319 if (!is_ios) { | 319 if (!is_ios) { |
| 320 deps += [ | 320 deps += [ |
| 321 "modules/audio_device:audio_device_tests", | 321 "modules/audio_device:audio_device_tests", |
| 322 "voice_engine:voe_auto_test", | 322 "voice_engine:voe_auto_test", |
| 323 ] | 323 ] |
| 324 } | 324 } |
| 325 if (rtc_enable_protobuf) { |
| 326 deps += [ "logging:rtc_event_log2rtp_dump" ] |
| 327 } |
| 325 } | 328 } |
| 326 } | 329 } |
| 327 } | 330 } |
| 328 | 331 |
| 329 rtc_static_library("webrtc_common") { | 332 rtc_static_library("webrtc_common") { |
| 330 sources = [ | 333 sources = [ |
| 331 "common_types.cc", | 334 "common_types.cc", |
| 332 "common_types.h", | 335 "common_types.h", |
| 333 "config.cc", | 336 "config.cc", |
| 334 "config.h", | 337 "config.h", |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 504 ] | 507 ] |
| 505 | 508 |
| 506 deps = [ | 509 deps = [ |
| 507 "//base:base_java_test_support", | 510 "//base:base_java_test_support", |
| 508 "//webrtc/examples:AppRTCMobile_javalib", | 511 "//webrtc/examples:AppRTCMobile_javalib", |
| 509 "//webrtc/sdk/android:libjingle_peerconnection_java", | 512 "//webrtc/sdk/android:libjingle_peerconnection_java", |
| 510 ] | 513 ] |
| 511 } | 514 } |
| 512 } | 515 } |
| 513 } | 516 } |
| OLD | NEW |