| OLD | NEW | 
|---|
| 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/chrome_build.gni") | 6 import("//build/config/chrome_build.gni") | 
| 7 import("//build/config/compiler/compiler.gni") | 7 import("//build/config/compiler/compiler.gni") | 
| 8 import("//build/config/nacl/config.gni") | 8 import("//build/config/nacl/config.gni") | 
| 9 import("//build/toolchain/cc_wrapper.gni") | 9 import("//build/toolchain/cc_wrapper.gni") | 
| 10 import("//build/toolchain/toolchain.gni") | 10 import("//build/toolchain/toolchain.gni") | 
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 248       "-Wno-undefined-bool-conversion", | 248       "-Wno-undefined-bool-conversion", | 
| 249       "-Wno-tautological-undefined-compare", | 249       "-Wno-tautological-undefined-compare", | 
| 250     ] | 250     ] | 
| 251   } | 251   } | 
| 252 | 252 | 
| 253   if (is_clang && !is_nacl) { | 253   if (is_clang && !is_nacl) { | 
| 254     # This is here so that all files get recompiled after a clang roll and | 254     # This is here so that all files get recompiled after a clang roll and | 
| 255     # when turning clang on or off. (defines are passed via the command line, | 255     # when turning clang on or off. (defines are passed via the command line, | 
| 256     # and build system rebuild things when their commandline changes). Nothing | 256     # and build system rebuild things when their commandline changes). Nothing | 
| 257     # should ever read this define. | 257     # should ever read this define. | 
| 258     defines += [ "CR_CLANG_REVISION=$clang_revision" ] | 258     defines += [ "CR_CLANG_REVISION=\"$clang_revision\"" ] | 
| 259   } | 259   } | 
| 260 | 260 | 
| 261   # Non-Mac Posix compiler flags setup. | 261   # Non-Mac Posix compiler flags setup. | 
| 262   # ----------------------------------- | 262   # ----------------------------------- | 
| 263   if (is_posix && !(is_mac || is_ios)) { | 263   if (is_posix && !(is_mac || is_ios)) { | 
| 264     if (enable_profiling) { | 264     if (enable_profiling) { | 
| 265       if (!is_debug) { | 265       if (!is_debug) { | 
| 266         cflags += [ "-g" ] | 266         cflags += [ "-g" ] | 
| 267 | 267 | 
| 268         if (enable_full_stack_frames_for_profiling) { | 268         if (enable_full_stack_frames_for_profiling) { | 
| (...skipping 1425 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1694 | 1694 | 
| 1695 if (is_ios || is_mac) { | 1695 if (is_ios || is_mac) { | 
| 1696   # On Mac and iOS, this enables support for ARC (automatic ref-counting). | 1696   # On Mac and iOS, this enables support for ARC (automatic ref-counting). | 
| 1697   # See http://clang.llvm.org/docs/AutomaticReferenceCounting.html. | 1697   # See http://clang.llvm.org/docs/AutomaticReferenceCounting.html. | 
| 1698   config("enable_arc") { | 1698   config("enable_arc") { | 
| 1699     common_flags = [ "-fobjc-arc" ] | 1699     common_flags = [ "-fobjc-arc" ] | 
| 1700     cflags_objc = common_flags | 1700     cflags_objc = common_flags | 
| 1701     cflags_objcc = common_flags | 1701     cflags_objcc = common_flags | 
| 1702   } | 1702   } | 
| 1703 } | 1703 } | 
| OLD | NEW | 
|---|