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

Side by Side Diff: build/config/compiler/BUILD.gn

Issue 132903005: Fix nan definition on GN Android build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/sysroot.gni") 6 import("//build/config/sysroot.gni")
7 7
8 # compiler --------------------------------------------------------------------- 8 # compiler ---------------------------------------------------------------------
9 # 9 #
10 # Base compiler configuration. 10 # Base compiler configuration.
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 "UNICODE", 284 "UNICODE",
285 ] 285 ]
286 } 286 }
287 287
288 # Stlport setup. Android uses a different (smaller) version of the STL. 288 # Stlport setup. Android uses a different (smaller) version of the STL.
289 if (is_android) { 289 if (is_android) {
290 if (is_clang) { 290 if (is_clang) {
291 # Work around incompatibilities between bionic and clang headers. 291 # Work around incompatibilities between bionic and clang headers.
292 defines += [ 292 defines += [
293 "__compiler_offsetof=__builtin_offsetof", 293 "__compiler_offsetof=__builtin_offsetof",
294 "-Dnan=__builtin_nan", 294 "nan=__builtin_nan",
295 ] 295 ]
296 } 296 }
297 297
298 defines += [ 298 defines += [
299 "USE_STLPORT=1", 299 "USE_STLPORT=1",
300 "_STLP_USE_PTR_SPECIALIZATIONS=1", 300 "_STLP_USE_PTR_SPECIALIZATIONS=1",
301 "__GNU_SOURCE=1", # Necessary for clone(). 301 "__GNU_SOURCE=1", # Necessary for clone().
302 ] 302 ]
303 303
304 ldflags += [ 304 ldflags += [
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 } else { 596 } else {
597 cflags = [ "-g1" ] 597 cflags = [ "-g1" ]
598 } 598 }
599 } 599 }
600 600
601 config("no_symbols") { 601 config("no_symbols") {
602 if (!is_win) { 602 if (!is_win) {
603 cflags = [ "-g0" ] 603 cflags = [ "-g0" ]
604 } 604 }
605 } 605 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698