Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(186)

Side by Side Diff: webrtc/BUILD.gn

Issue 1307633008: GN: Fix invalid configuration for Android GCC build. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/build/common.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 if (mips_dsp_rev == 1) { 146 if (mips_dsp_rev == 1) {
147 defines += [ "MIPS_DSP_R1_LE" ] 147 defines += [ "MIPS_DSP_R1_LE" ]
148 } else if (mips_dsp_rev == 2) { 148 } else if (mips_dsp_rev == 2) {
149 defines += [ 149 defines += [
150 "MIPS_DSP_R1_LE", 150 "MIPS_DSP_R1_LE",
151 "MIPS_DSP_R2_LE", 151 "MIPS_DSP_R2_LE",
152 ] 152 ]
153 } 153 }
154 } 154 }
155 155
156 # TODO(kjellander): Handle warnings on Windows where WebRTC differ from the 156 # TODO(kjellander): Handle warnings on Windows where WebRTC differ from the
pbos-webrtc 2015/09/07 08:27:28 (Should this TODO be here?)
kjellander_webrtc 2015/09/07 10:57:10 No, it comes from the time when I created the GN c
157 # default warnings set in build/config/compiler/BUILD.gn. 157 # default warnings set in build/config/compiler/BUILD.gn.
158 158
159 if (is_android && is_clang) { 159 if (is_android && !is_clang) {
160 # The Android NDK doesn"t provide optimized versions of these 160 # The Android NDK doesn"t provide optimized versions of these
161 # functions. Ensure they are disabled for all compilers. 161 # functions. Ensure they are disabled for all compilers.
162 cflags += [ 162 cflags += [
163 "-fno-builtin-cos", 163 "-fno-builtin-cos",
164 "-fno-builtin-sin", 164 "-fno-builtin-sin",
165 "-fno-builtin-cosf", 165 "-fno-builtin-cosf",
166 "-fno-builtin-sinf", 166 "-fno-builtin-sinf",
167 ] 167 ]
168 } 168 }
169 } 169 }
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 if (rtc_enable_protobuf) { 273 if (rtc_enable_protobuf) {
274 defines += [ "ENABLE_RTC_EVENT_LOG" ] 274 defines += [ "ENABLE_RTC_EVENT_LOG" ]
275 deps += [ ":rtc_event_log_proto" ] 275 deps += [ ":rtc_event_log_proto" ]
276 } 276 }
277 if (is_clang && !is_nacl) { 277 if (is_clang && !is_nacl) {
278 # Suppress warnings from Chrome's Clang plugins. 278 # Suppress warnings from Chrome's Clang plugins.
279 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. 279 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
280 configs -= [ "//build/config/clang:find_bad_constructs" ] 280 configs -= [ "//build/config/clang:find_bad_constructs" ]
281 } 281 }
282 } 282 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698