Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2016 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) { |
| 11 import("//build/config/android/config.gni") | 11 import("//build/config/android/config.gni") |
| 12 import("//build/config/android/rules.gni") | 12 import("//build/config/android/rules.gni") |
| 13 } else if (is_mac) { | 13 } else if (is_mac) { |
| 14 import("//build/config/mac/rules.gni") | 14 import("//build/config/mac/rules.gni") |
| 15 } else if (is_ios) { | 15 } else if (is_ios) { |
| 16 import("//build/config/ios/rules.gni") | 16 import("//build/config/ios/rules.gni") |
| 17 } | 17 } |
| 18 | 18 |
| 19 group("examples") { | 19 group("examples") { |
| 20 # This target shall build all targets in examples. | 20 # This target shall build all targets in examples. |
| 21 testonly = true | 21 testonly = true |
| 22 public_deps = [] | 22 public_deps = [] |
| 23 | 23 |
| 24 if (is_android) { | 24 if (is_android) { |
| 25 public_deps += [ | 25 public_deps += [ |
| 26 ":AppRTCMobile", | 26 ":AppRTCMobile", |
| 27 ":AppRTCMobileTest", | 27 ":AppRTCMobileTest", |
| 28 ":AppRTCMobileTestStubbedVideoIO", | |
| 28 ] | 29 ] |
| 29 } | 30 } |
| 30 | 31 |
| 31 if (!build_with_chromium) { | 32 if (!build_with_chromium) { |
| 32 public_deps += [ ":stun_prober" ] | 33 public_deps += [ ":stun_prober" ] |
| 33 } | 34 } |
| 34 | 35 |
| 35 if (is_ios || (is_mac && target_cpu != "x86")) { | 36 if (is_ios || (is_mac && target_cpu != "x86")) { |
| 36 public_deps += [ ":AppRTCMobile" ] | 37 public_deps += [ ":AppRTCMobile" ] |
| 37 } | 38 } |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 109 java_files = [ | 110 java_files = [ |
| 110 "androidtests/src/org/appspot/apprtc/test/FileVideoCapturerTest.java", | 111 "androidtests/src/org/appspot/apprtc/test/FileVideoCapturerTest.java", |
| 111 "androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java", | 112 "androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java", |
| 112 "androidtests/src/org/appspot/apprtc/test/VideoFileRendererTest.java", | 113 "androidtests/src/org/appspot/apprtc/test/VideoFileRendererTest.java", |
| 113 ] | 114 ] |
| 114 | 115 |
| 115 apk_under_test = ":AppRTCMobile" | 116 apk_under_test = ":AppRTCMobile" |
| 116 | 117 |
| 117 deps = [ | 118 deps = [ |
| 118 ":AppRTCMobile_javalib", | 119 ":AppRTCMobile_javalib", |
| 120 "//third_party/android_support_test_runner:rules_java", | |
|
kjellander_webrtc
2016/12/27 06:31:42
Please remove line 120-124 as they're no longer ne
mandermo
2017/01/03 14:17:58
I manage to remove all the lines exept line 122, t
kjellander_webrtc
2017/01/04 15:10:08
Ah, that's probably related to the AndroidManifest
| |
| 121 "//third_party/android_support_test_runner:runner_java", | |
| 122 "//third_party/espresso:espresso_all_java", | |
| 123 "//third_party/hamcrest:hamcrest_java", | |
| 124 "//third_party/junit", | |
| 119 "//webrtc/sdk/android:libjingle_peerconnection_java", | 125 "//webrtc/sdk/android:libjingle_peerconnection_java", |
| 120 ] | 126 ] |
| 121 | 127 |
| 122 data = [ | 128 data = [ |
| 123 "//webrtc/examples/androidtests/src/org/appspot/apprtc/test/capturetestvid eo.y4m", | 129 "//webrtc/examples/androidtests/src/org/appspot/apprtc/test/capturetestvid eo.y4m", |
| 124 ] | 130 ] |
| 125 } | 131 } |
| 132 | |
| 133 instrumentation_test_apk("AppRTCMobileTestStubbedVideoIO") { | |
| 134 apk_name = "AppRTCMobileTestStubbedVideoIO" | |
| 135 android_manifest = "androidtests/AndroidManifest.xml" | |
| 136 | |
| 137 java_files = [ "androidtests/src/org/appspot/apprtc/test/ConnectActivityStub bedInputOutputTest.java" ] | |
| 138 | |
| 139 apk_under_test = ":AppRTCMobile" | |
| 140 | |
| 141 deps = [ | |
| 142 ":AppRTCMobile_javalib", | |
| 143 "//third_party/android_support_test_runner:rules_java", | |
| 144 "//third_party/android_support_test_runner:runner_java", | |
| 145 "//third_party/espresso:espresso_all_java", | |
| 146 "//third_party/hamcrest:hamcrest_java", | |
| 147 "//third_party/junit", | |
| 148 "//webrtc/sdk/android:libjingle_peerconnection_java", | |
| 149 ] | |
| 150 | |
| 151 data = [ | |
| 152 "//resources/reference_video_640x360_30fps.y4m", | |
| 153 ] | |
| 154 } | |
| 126 } | 155 } |
| 127 | 156 |
| 128 if (is_ios || (is_mac && target_cpu != "x86")) { | 157 if (is_ios || (is_mac && target_cpu != "x86")) { |
| 129 config("warnings_config") { | 158 config("warnings_config") { |
| 130 # GN orders flags on a target before flags from configs. The default config | 159 # GN orders flags on a target before flags from configs. The default config |
| 131 # adds these flags so to cancel them out they need to come from a config and | 160 # adds these flags so to cancel them out they need to come from a config and |
| 132 # cannot be on the target directly. | 161 # cannot be on the target directly. |
| 133 if (is_ios) { | 162 if (is_ios) { |
| 134 # Suppress compiler warnings about deprecated that triggered | 163 # Suppress compiler warnings about deprecated that triggered |
| 135 # when moving from ios_deployment_target 7.0 to 9.0. | 164 # when moving from ios_deployment_target 7.0 to 9.0. |
| (...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 589 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 618 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 590 } | 619 } |
| 591 | 620 |
| 592 deps = [ | 621 deps = [ |
| 593 "../p2p:libstunprober", | 622 "../p2p:libstunprober", |
| 594 "../p2p:rtc_p2p", | 623 "../p2p:rtc_p2p", |
| 595 "../system_wrappers:field_trial_default", | 624 "../system_wrappers:field_trial_default", |
| 596 ] | 625 ] |
| 597 } | 626 } |
| 598 } | 627 } |
| OLD | NEW |