Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2015 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 if (is_android) { | 10 if (is_android) { |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 71 "../modules/audio_device:mock_audio_device", | 71 "../modules/audio_device:mock_audio_device", |
| 72 "../modules/audio_mixer:audio_mixer_impl", | 72 "../modules/audio_mixer:audio_mixer_impl", |
| 73 "../modules/congestion_controller:congestion_controller", | 73 "../modules/congestion_controller:congestion_controller", |
| 74 "../modules/pacing:pacing", | 74 "../modules/pacing:pacing", |
| 75 "../test:test_common", | 75 "../test:test_common", |
| 76 "../test:test_support", | 76 "../test:test_support", |
| 77 "utility:utility_tests", | 77 "utility:utility_tests", |
| 78 "//testing/gmock", | 78 "//testing/gmock", |
| 79 "//testing/gtest", | 79 "//testing/gtest", |
| 80 ] | 80 ] |
| 81 if (rtc_enable_protobuf) { | |
| 82 deps += [ ":low_bandwidth_audio_test" ] | |
| 83 } | |
| 84 | |
| 81 if (!build_with_chromium && is_clang) { | 85 if (!build_with_chromium && is_clang) { |
| 82 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 86 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 83 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 87 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 84 } | 88 } |
| 85 } | 89 } |
| 86 | 90 |
| 87 if (rtc_enable_protobuf) { | 91 if (rtc_enable_protobuf) { |
| 88 rtc_executable("low_bandwidth_audio_test") { | 92 rtc_executable("low_bandwidth_audio_test") { |
| 89 testonly = true | 93 testonly = true |
| 94 configs += [ "..:rtc_unittests_config" ] | |
|
kjellander_webrtc
2017/03/17 07:11:41
Why do you need this? To disable the warnings list
oprypin_webrtc
2017/03/17 10:16:50
OK, turns out it's not needed, thanks.
| |
| 90 | 95 |
| 91 sources = [ | 96 sources = [ |
| 92 "test/low_bandwidth_audio_test.cc", | 97 "test/low_bandwidth_audio_test.cc", |
| 98 "test/low_bandwidth_audio_test.h", | |
| 93 ] | 99 ] |
| 94 | 100 |
| 95 deps = [] | 101 deps = [ |
| 102 "../common_audio:common_audio", | |
|
kjellander_webrtc
2017/03/17 07:11:41
Use "../common_audio" instead. It's the same (targ
oprypin_webrtc
2017/03/17 10:16:50
Done.
| |
| 103 "../system_wrappers:metrics_default", | |
| 104 "../system_wrappers:system_wrappers", | |
|
kjellander_webrtc
2017/03/17 07:11:41
../system_wrappers is enough.
oprypin_webrtc
2017/03/17 10:16:50
Done.
| |
| 105 "../test:fake_audio_device", | |
| 106 "../test:run_test", | |
| 107 "../test:test_common", | |
| 108 "../test:test_main", | |
| 109 ] | |
| 110 if (is_android) { | |
| 111 deps += [ "//testing/android/native_test:native_test_native_code" ] | |
| 112 } else { | |
| 113 deps += [ "../modules/video_capture:video_capture_internal_impl" ] | |
|
kjellander_webrtc
2017/03/17 07:11:41
What needs this? It seems we should try to move th
oprypin_webrtc
2017/03/17 10:16:50
Getting this error without this line:
../../webrtc
kjellander_webrtc
2017/03/17 10:37:18
Hmm, I'm unable to see what pulls that in. That ta
| |
| 114 } | |
| 96 | 115 |
| 97 if (is_android) { | 116 data = [ |
| 98 deps += [ "//testing/android/native_test:native_test_support" ] | 117 "//resources/voice_engine/audio_tiny16.wav", |
| 118 ] | |
| 119 | |
| 120 if (!build_with_chromium && is_clang) { | |
| 121 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163) | |
| 122 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | |
|
kjellander_webrtc
2017/03/17 07:11:41
Is it possible to remove this or do you need it to
oprypin_webrtc
2017/03/17 10:16:50
Getting this error without this line:
In file incl
kjellander_webrtc
2017/03/17 10:37:18
I see. It's not your fault. Then we have to keep i
| |
| 99 } | 123 } |
| 100 } | 124 } |
| 101 } | 125 } |
| 102 } | 126 } |
| OLD | NEW |