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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 } | 172 } |
173 | 173 |
174 if (is_clang) { | 174 if (is_clang) { |
175 cflags += [ | 175 cflags += [ |
176 "-Wc++11-narrowing", | 176 "-Wc++11-narrowing", |
177 "-Wimplicit-fallthrough", | 177 "-Wimplicit-fallthrough", |
178 "-Wthread-safety", | 178 "-Wthread-safety", |
179 "-Winconsistent-missing-override", | 179 "-Winconsistent-missing-override", |
180 "-Wundef", | 180 "-Wundef", |
181 ] | 181 ] |
| 182 |
| 183 # use_xcode_clang only refers to the iOS toolchain, host binaries use |
| 184 # chromium's clang always. |
| 185 if (!is_nacl && |
| 186 (!use_xcode_clang || current_toolchain == host_toolchain)) { |
| 187 # Flags NaCl (Clang 3.7) and Xcode 7.3 (Clang clang-703.0.31) do not |
| 188 # recognize. |
| 189 cflags += [ "-Wunused-lambda-capture" ] |
| 190 } |
182 } | 191 } |
183 } | 192 } |
184 | 193 |
185 if (current_cpu == "arm64") { | 194 if (current_cpu == "arm64") { |
186 defines += [ "WEBRTC_ARCH_ARM64" ] | 195 defines += [ "WEBRTC_ARCH_ARM64" ] |
187 defines += [ "WEBRTC_HAS_NEON" ] | 196 defines += [ "WEBRTC_HAS_NEON" ] |
188 } | 197 } |
189 | 198 |
190 if (current_cpu == "arm") { | 199 if (current_cpu == "arm") { |
191 defines += [ "WEBRTC_ARCH_ARM" ] | 200 defines += [ "WEBRTC_ARCH_ARM" ] |
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
534 ] | 543 ] |
535 | 544 |
536 deps = [ | 545 deps = [ |
537 "examples:AppRTCMobile_javalib", | 546 "examples:AppRTCMobile_javalib", |
538 "sdk/android:libjingle_peerconnection_java", | 547 "sdk/android:libjingle_peerconnection_java", |
539 "//base:base_java_test_support", | 548 "//base:base_java_test_support", |
540 ] | 549 ] |
541 } | 550 } |
542 } | 551 } |
543 } | 552 } |
OLD | NEW |