| 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 512 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 523 | 523 |
| 524 if (is_android) { | 524 if (is_android) { |
| 525 deps += [ "//testing/android/native_test:native_test_support" ] | 525 deps += [ "//testing/android/native_test:native_test_support" ] |
| 526 shard_timeout = 900 | 526 shard_timeout = 900 |
| 527 } | 527 } |
| 528 | 528 |
| 529 if (is_ios || is_mac) { | 529 if (is_ios || is_mac) { |
| 530 deps += [ | 530 deps += [ |
| 531 "sdk:rtc_sdk_peerconnection_objc", | 531 "sdk:rtc_sdk_peerconnection_objc", |
| 532 "system_wrappers:system_wrappers_default", | 532 "system_wrappers:system_wrappers_default", |
| 533 "//third_party/ocmock", |
| 533 ] | 534 ] |
| 534 sources += [ | 535 sources += [ |
| 535 "sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm", | 536 "sdk/objc/Framework/UnitTests/RTCConfigurationTest.mm", |
| 536 "sdk/objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm", | 537 "sdk/objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm", |
| 537 "sdk/objc/Framework/UnitTests/RTCIceCandidateTest.mm", | 538 "sdk/objc/Framework/UnitTests/RTCIceCandidateTest.mm", |
| 538 "sdk/objc/Framework/UnitTests/RTCIceServerTest.mm", | 539 "sdk/objc/Framework/UnitTests/RTCIceServerTest.mm", |
| 539 "sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm", | 540 "sdk/objc/Framework/UnitTests/RTCMediaConstraintsTest.mm", |
| 540 "sdk/objc/Framework/UnitTests/RTCSessionDescriptionTest.mm", | 541 "sdk/objc/Framework/UnitTests/RTCSessionDescriptionTest.mm", |
| 542 "sdk/objc/Framework/UnitTests/avformatmappertests.mm", |
| 541 ] | 543 ] |
| 542 | 544 |
| 543 # TODO(tkchin): Cleanup this warning. | 545 # TODO(tkchin): Cleanup this warning. |
| 544 cflags = [ "-Wno-objc-property-no-attribute" ] | 546 cflags = [ "-Wno-objc-property-no-attribute" ] |
| 545 | 547 |
| 546 # |-ObjC| flag needed to make sure category method implementations | 548 # |-ObjC| flag needed to make sure category method implementations |
| 547 # are included: | 549 # are included: |
| 548 # https://developer.apple.com/library/mac/qa/qa1490/_index.html | 550 # https://developer.apple.com/library/mac/qa/qa1490/_index.html |
| 549 ldflags = [ "-ObjC" ] | 551 ldflags = [ "-ObjC" ] |
| 550 } | 552 } |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 708 | 710 |
| 709 deps = [ | 711 deps = [ |
| 710 "//base:base_java_test_support", | 712 "//base:base_java_test_support", |
| 711 "//webrtc/api:libjingle_peerconnection_java", | 713 "//webrtc/api:libjingle_peerconnection_java", |
| 712 "//webrtc/api:libjingle_peerconnection_jni", | 714 "//webrtc/api:libjingle_peerconnection_jni", |
| 713 "//webrtc/examples:AppRTCMobile_javalib", | 715 "//webrtc/examples:AppRTCMobile_javalib", |
| 714 ] | 716 ] |
| 715 } | 717 } |
| 716 } | 718 } |
| 717 } | 719 } |
| OLD | NEW |