| 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 887 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 898 "/wd4456", | 898 "/wd4456", |
| 899 "/wd4457", | 899 "/wd4457", |
| 900 "/wd4458", | 900 "/wd4458", |
| 901 "/wd4459", | 901 "/wd4459", |
| 902 ] | 902 ] |
| 903 | 903 |
| 904 cflags += [ | 904 cflags += [ |
| 905 # C4312 is a VS 2015 64-bit warning for integer to larger pointer. | 905 # C4312 is a VS 2015 64-bit warning for integer to larger pointer. |
| 906 # TODO(brucedawson): fix warnings, crbug.com/554200 | 906 # TODO(brucedawson): fix warnings, crbug.com/554200 |
| 907 "/wd4312", | 907 "/wd4312", |
| 908 | |
| 909 # TODO(brucedawson): http://crbug.com/593448 - C4595 is an 'illegal | |
| 910 # inline operator new' warning that is new in VS 2015 Update 2. | |
| 911 # This is equivalent to clang's no-inline-new-delete warning. | |
| 912 # See http://bugs.icu-project.org/trac/ticket/11122 | |
| 913 "/wd4595", | |
| 914 ] | 908 ] |
| 915 | 909 |
| 916 if (current_cpu == "x86") { | 910 if (current_cpu == "x86") { |
| 917 cflags += [ | 911 cflags += [ |
| 918 # VC++ 2015 changes 32-bit size_t truncation warnings from 4244 to | 912 # VC++ 2015 changes 32-bit size_t truncation warnings from 4244 to |
| 919 # 4267. Example: short TruncTest(size_t x) { return x; } | 913 # 4267. Example: short TruncTest(size_t x) { return x; } |
| 920 # Since we disable 4244 we need to disable 4267 during migration. | 914 # Since we disable 4244 we need to disable 4267 during migration. |
| 921 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 915 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 922 "/wd4267", | 916 "/wd4267", |
| 923 ] | 917 ] |
| (...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1607 | 1601 |
| 1608 if (is_ios || is_mac) { | 1602 if (is_ios || is_mac) { |
| 1609 # On Mac and iOS, this enables support for ARC (automatic ref-counting). | 1603 # On Mac and iOS, this enables support for ARC (automatic ref-counting). |
| 1610 # See http://clang.llvm.org/docs/AutomaticReferenceCounting.html. | 1604 # See http://clang.llvm.org/docs/AutomaticReferenceCounting.html. |
| 1611 config("enable_arc") { | 1605 config("enable_arc") { |
| 1612 common_flags = [ "-fobjc-arc" ] | 1606 common_flags = [ "-fobjc-arc" ] |
| 1613 cflags_objc = common_flags | 1607 cflags_objc = common_flags |
| 1614 cflags_objcc = common_flags | 1608 cflags_objcc = common_flags |
| 1615 } | 1609 } |
| 1616 } | 1610 } |
| OLD | NEW |