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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 "-Woverloaded-virtual", | 158 "-Woverloaded-virtual", |
159 ] | 159 ] |
160 } | 160 } |
161 | 161 |
162 if (is_clang) { | 162 if (is_clang) { |
163 cflags += [ | 163 cflags += [ |
164 "-Wimplicit-fallthrough", | 164 "-Wimplicit-fallthrough", |
165 "-Wthread-safety", | 165 "-Wthread-safety", |
166 "-Winconsistent-missing-override", | 166 "-Winconsistent-missing-override", |
167 "-Wundef", | 167 "-Wundef", |
| 168 "-Wno-unused-lambda-capture", |
168 ] | 169 ] |
169 } | 170 } |
170 } | 171 } |
171 | 172 |
172 if (current_cpu == "arm64") { | 173 if (current_cpu == "arm64") { |
173 defines += [ "WEBRTC_ARCH_ARM64" ] | 174 defines += [ "WEBRTC_ARCH_ARM64" ] |
174 defines += [ "WEBRTC_HAS_NEON" ] | 175 defines += [ "WEBRTC_HAS_NEON" ] |
175 } | 176 } |
176 | 177 |
177 if (current_cpu == "arm") { | 178 if (current_cpu == "arm") { |
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
499 ] | 500 ] |
500 | 501 |
501 deps = [ | 502 deps = [ |
502 "//base:base_java_test_support", | 503 "//base:base_java_test_support", |
503 "//webrtc/examples:AppRTCMobile_javalib", | 504 "//webrtc/examples:AppRTCMobile_javalib", |
504 "//webrtc/sdk/android:libjingle_peerconnection_java", | 505 "//webrtc/sdk/android:libjingle_peerconnection_java", |
505 ] | 506 ] |
506 } | 507 } |
507 } | 508 } |
508 } | 509 } |
OLD | NEW |