| 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 if (is_android) { | 9 if (is_android) { |
| 10 import("//build/config/android/config.gni") | 10 import("//build/config/android/config.gni") |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 | 126 |
| 127 # TODO(jschuh): Bug 1348: fix this warning. | 127 # TODO(jschuh): Bug 1348: fix this warning. |
| 128 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] | 128 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
| 129 | 129 |
| 130 if (is_win) { | 130 if (is_win) { |
| 131 libs += [ "winmm.lib" ] | 131 libs += [ "winmm.lib" ] |
| 132 | 132 |
| 133 cflags = [ "/wd4334" ] # Ignore warning on shift operator promotion. | 133 cflags = [ "/wd4334" ] # Ignore warning on shift operator promotion. |
| 134 } | 134 } |
| 135 | 135 |
| 136 if (is_clang) { | 136 if (is_win && is_clang) { |
| 137 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 137 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |
| 138 configs -= [ "//build/config/clang:find_bad_constructs" ] | 138 configs -= [ "//build/config/clang:find_bad_constructs" ] |
| 139 } | 139 } |
| 140 | 140 |
| 141 deps += [ "../base:rtc_base_approved" ] | 141 deps += [ "../base:rtc_base_approved" ] |
| 142 } | 142 } |
| 143 | 143 |
| 144 source_set("field_trial_default") { | 144 source_set("field_trial_default") { |
| 145 sources = [ | 145 sources = [ |
| 146 "include/field_trial_default.h", | 146 "include/field_trial_default.h", |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 "//testing/gtest", | 243 "//testing/gtest", |
| 244 ] | 244 ] |
| 245 | 245 |
| 246 if (is_android) { | 246 if (is_android) { |
| 247 deps += [ "//testing/android/native_test:native_test_support" ] | 247 deps += [ "//testing/android/native_test:native_test_support" ] |
| 248 | 248 |
| 249 shard_timeout = 900 | 249 shard_timeout = 900 |
| 250 } | 250 } |
| 251 } | 251 } |
| 252 } | 252 } |
| OLD | NEW |