| 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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 "HAVE_SCTP", | 145 "HAVE_SCTP", |
| 146 "HAVE_SRTP", | 146 "HAVE_SRTP", |
| 147 "HAVE_WEBRTC_VIDEO", | 147 "HAVE_WEBRTC_VIDEO", |
| 148 "HAVE_WEBRTC_VOICE", | 148 "HAVE_WEBRTC_VOICE", |
| 149 "LOGGING_INSIDE_WEBRTC", | 149 "LOGGING_INSIDE_WEBRTC", |
| 150 "SSL_USE_OPENSSL", | 150 "SSL_USE_OPENSSL", |
| 151 "USE_WEBRTC_DEV_BRANCH", | 151 "USE_WEBRTC_DEV_BRANCH", |
| 152 ] | 152 ] |
| 153 } else { | 153 } else { |
| 154 if (is_posix) { | 154 if (is_posix) { |
| 155 # -Wextra is currently disabled in Chromium"s common.gypi. Enable | 155 # Enable more warnings: -Wextra is currently disabled in Chromium. |
| 156 # for targets that can handle it. For Android/arm64 right now | 156 cflags = [ |
| 157 # there will be an "enumeral and non-enumeral type in conditional | 157 "-Wextra", |
| 158 # expression" warning in android_tools/ndk_experimental"s version | |
| 159 # of stlport. | |
| 160 # See: https://code.google.com/p/chromium/issues/detail?id=379699 | |
| 161 if (current_cpu != "arm64" || !is_android) { | |
| 162 cflags = [ | |
| 163 "-Wextra", | |
| 164 | 158 |
| 165 # We need to repeat some flags from Chromium"s common.gypi | 159 # Repeat some flags that get overridden by -Wextra. |
| 166 # here that get overridden by -Wextra. | 160 "-Wno-unused-parameter", |
| 167 "-Wno-unused-parameter", | 161 "-Wno-missing-field-initializers", |
| 168 "-Wno-missing-field-initializers", | 162 "-Wno-strict-overflow", |
| 169 "-Wno-strict-overflow", | 163 ] |
| 170 ] | 164 cflags_cc = [ |
| 171 cflags_cc = [ | 165 "-Wnon-virtual-dtor", |
| 172 "-Wnon-virtual-dtor", | |
| 173 | 166 |
| 174 # This is enabled for clang; enable for gcc as well. | 167 # This is enabled for clang; enable for gcc as well. |
| 175 "-Woverloaded-virtual", | 168 "-Woverloaded-virtual", |
| 176 ] | 169 ] |
| 177 } | |
| 178 } | 170 } |
| 179 | 171 |
| 180 if (is_clang) { | 172 if (is_clang) { |
| 181 cflags += [ | 173 cflags += [ |
| 182 "-Wimplicit-fallthrough", | 174 "-Wimplicit-fallthrough", |
| 183 "-Wthread-safety", | 175 "-Wthread-safety", |
| 184 "-Winconsistent-missing-override", | 176 "-Winconsistent-missing-override", |
| 185 "-Wundef", | 177 "-Wundef", |
| 186 ] | 178 ] |
| 187 } | 179 } |
| (...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 778 | 770 |
| 779 deps = [ | 771 deps = [ |
| 780 "//base:base_java_test_support", | 772 "//base:base_java_test_support", |
| 781 "//webrtc/api:libjingle_peerconnection_java", | 773 "//webrtc/api:libjingle_peerconnection_java", |
| 782 "//webrtc/api:libjingle_peerconnection_jni", | 774 "//webrtc/api:libjingle_peerconnection_jni", |
| 783 "//webrtc/examples:AppRTCMobile_javalib", | 775 "//webrtc/examples:AppRTCMobile_javalib", |
| 784 ] | 776 ] |
| 785 } | 777 } |
| 786 } | 778 } |
| 787 } | 779 } |
| OLD | NEW |