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

Side by Side Diff: webrtc/build/common.gypi

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
« webrtc/BUILD.gn ('K') | « webrtc/BUILD.gn ('k') | no next file » | 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) 2012 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2012 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 # This file contains common settings for building WebRTC components. 9 # This file contains common settings for building WebRTC components.
10 10
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 ], 365 ],
366 # Re-enable some warnings that Chromium disables. 366 # Re-enable some warnings that Chromium disables.
367 'msvs_disabled_warnings!': [4189,], 367 'msvs_disabled_warnings!': [4189,],
368 }], 368 }],
369 ['OS=="android"', { 369 ['OS=="android"', {
370 'defines': [ 370 'defines': [
371 'WEBRTC_LINUX', 371 'WEBRTC_LINUX',
372 'WEBRTC_ANDROID', 372 'WEBRTC_ANDROID',
373 ], 373 ],
374 'conditions': [ 374 'conditions': [
375 ['clang!=1', { 375 ['clang==0', {
376 # The Android NDK doesn't provide optimized versions of these 376 # The Android NDK doesn't provide optimized versions of these
377 # functions. Ensure they are disabled for all compilers. 377 # functions. Ensure they are disabled for all compilers.
378 'cflags': [ 378 'cflags': [
379 '-fno-builtin-cos', 379 '-fno-builtin-cos',
380 '-fno-builtin-sin', 380 '-fno-builtin-sin',
381 '-fno-builtin-cosf', 381 '-fno-builtin-cosf',
382 '-fno-builtin-sinf', 382 '-fno-builtin-sinf',
383 ], 383 ],
384 }], 384 }],
385 ], 385 ],
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 # of a more specific macro. 446 # of a more specific macro.
447 'defines': [ 447 'defines': [
448 'WEBRTC_POSIX', 448 'WEBRTC_POSIX',
449 ], 449 ],
450 }], 450 }],
451 ], 451 ],
452 }, 452 },
453 }, # target_defaults 453 }, # target_defaults
454 } 454 }
455 455
OLDNEW
« webrtc/BUILD.gn ('K') | « webrtc/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698