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("../webrtc.gni") | 9 import("../webrtc.gni") |
| 10 import("audio_coding/audio_coding.gni") | 10 import("audio_coding/audio_coding.gni") |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 216 ] | 216 ] |
| 217 | 217 |
| 218 if (!build_with_chromium && is_clang) { | 218 if (!build_with_chromium && is_clang) { |
| 219 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 219 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 220 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 220 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 221 } | 221 } |
| 222 | 222 |
| 223 deps = [ | 223 deps = [ |
| 224 ":module_api", | 224 ":module_api", |
| 225 "../test:test_main", | 225 "../test:test_main", |
| 226 "audio_coding:audio_coding_unittests", | 226 |
| 227 "audio_conference_mixer:audio_conference_mixer_unittests", | 227 # "audio_coding:audio_coding_unittests", |
|
the sun
2017/06/29 10:41:52
Uh-oh! Please revert these changes - I was trying
peah-webrtc
2017/06/29 11:46:31
Done.
| |
| 228 "audio_device:audio_device_unittests", | 228 # "audio_conference_mixer:audio_conference_mixer_unittests", |
| 229 "audio_mixer:audio_mixer_unittests", | 229 # "audio_device:audio_device_unittests", |
| 230 "audio_processing:audio_processing_unittests", | 230 # "audio_mixer:audio_mixer_unittests", |
| 231 "bitrate_controller:bitrate_controller_unittests", | 231 # "audio_processing:audio_processing_unittests", |
| 232 # "bitrate_controller:bitrate_controller_unittests", | |
| 232 "congestion_controller:congestion_controller_unittests", | 233 "congestion_controller:congestion_controller_unittests", |
| 233 "desktop_capture:desktop_capture_unittests", | 234 |
| 234 "media_file:media_file_unittests", | 235 # "desktop_capture:desktop_capture_unittests", |
| 235 "pacing:pacing_unittests", | 236 # "media_file:media_file_unittests", |
| 237 # "pacing:pacing_unittests", | |
| 236 "remote_bitrate_estimator:remote_bitrate_estimator_unittests", | 238 "remote_bitrate_estimator:remote_bitrate_estimator_unittests", |
| 237 "rtp_rtcp:rtp_rtcp_unittests", | 239 |
| 238 "utility:utility_unittests", | 240 # "rtp_rtcp:rtp_rtcp_unittests", |
| 239 "video_capture", | 241 # "utility:utility_unittests", |
| 240 "video_coding:video_coding_unittests", | 242 # "video_capture", |
| 241 "video_processing:video_processing_unittests", | 243 # "video_coding:video_coding_unittests", |
| 244 # "video_processing:video_processing_unittests", | |
| 242 ] | 245 ] |
| 243 | 246 |
| 244 data = modules_unittests_resources | 247 data = modules_unittests_resources |
| 245 | 248 |
| 246 if (is_android) { | 249 if (is_android) { |
| 247 deps += [ | 250 deps += [ |
| 248 "//testing/android/native_test:native_test_support", | 251 "//testing/android/native_test:native_test_support", |
| 249 "//webrtc/sdk/android:libjingle_peerconnection_java", | 252 "//webrtc/sdk/android:libjingle_peerconnection_java", |
| 250 ] | 253 ] |
| 251 shard_timeout = 900 | 254 shard_timeout = 900 |
| 252 } | 255 } |
| 253 if (is_ios) { | 256 if (is_ios) { |
| 254 info_plist = "//webrtc/test/ios/Info.plist" | 257 info_plist = "//webrtc/test/ios/Info.plist" |
| 255 deps += [ ":modules_unittests_bundle_data" ] | 258 deps += [ ":modules_unittests_bundle_data" ] |
| 256 configs += [ "..:common_objc" ] | 259 configs += [ "..:common_objc" ] |
| 257 ldflags = [ "-ObjC" ] | 260 ldflags = [ "-ObjC" ] |
| 258 } | 261 } |
| 259 } | 262 } |
| 260 } | 263 } |
| OLD | NEW |