| 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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 cflags_cc = [ | 154 cflags_cc = [ |
| 155 "-Wnon-virtual-dtor", | 155 "-Wnon-virtual-dtor", |
| 156 | 156 |
| 157 # This is enabled for clang; enable for gcc as well. | 157 # This is enabled for clang; enable for gcc as well. |
| 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 "-Wc++11-narrowing", |
| 164 "-Wimplicit-fallthrough", | 165 "-Wimplicit-fallthrough", |
| 165 "-Wthread-safety", | 166 "-Wthread-safety", |
| 166 "-Winconsistent-missing-override", | 167 "-Winconsistent-missing-override", |
| 167 "-Wundef", | 168 "-Wundef", |
| 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" ] |
| (...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 534 ] | 535 ] |
| 535 | 536 |
| 536 deps = [ | 537 deps = [ |
| 537 "examples:AppRTCMobile_javalib", | 538 "examples:AppRTCMobile_javalib", |
| 538 "sdk/android:libjingle_peerconnection_java", | 539 "sdk/android:libjingle_peerconnection_java", |
| 539 "//base:base_java_test_support", | 540 "//base:base_java_test_support", |
| 540 ] | 541 ] |
| 541 } | 542 } |
| 542 } | 543 } |
| 543 } | 544 } |
| OLD | NEW |