| 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 | 10 |
| (...skipping 765 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 776 cflags += [ | 776 cflags += [ |
| 777 # VC++ 2015 changes 32-bit size_t truncation warnings from 4244 to 4267. | 777 # VC++ 2015 changes 32-bit size_t truncation warnings from 4244 to 4267. |
| 778 # Example: short TruncTest(size_t x) { return x; } | 778 # Example: short TruncTest(size_t x) { return x; } |
| 779 # Since we disable 4244 we need to disable 4267 during migration. | 779 # Since we disable 4244 we need to disable 4267 during migration. |
| 780 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 780 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 781 "/wd4267", | 781 "/wd4267", |
| 782 | 782 |
| 783 # C4312 is a VS 2015 64-bit warning for integer to larger pointer. | 783 # C4312 is a VS 2015 64-bit warning for integer to larger pointer. |
| 784 # TODO(brucedawson): fix warnings, crbug.com/554200 | 784 # TODO(brucedawson): fix warnings, crbug.com/554200 |
| 785 "/wd4312", | 785 "/wd4312", |
| 786 |
| 787 # TODO(brucedawson): http://crbug.com/593448 4334 is a 'suspicious |
| 788 # shift' warning and 4595 is an 'illegal inline operator new' warning |
| 789 # Both are new in VS 2015 Update 2 and can safely be deferred for now. |
| 790 "/wd4334", |
| 791 "/wd4595", |
| 786 ] | 792 ] |
| 787 } | 793 } |
| 788 | 794 |
| 789 # VS xtree header file needs to be patched or 4702 (unreachable code | 795 # VS xtree header file needs to be patched or 4702 (unreachable code |
| 790 # warning) is reported if _HAS_EXCEPTIONS=0. Disable the warning if xtree is | 796 # warning) is reported if _HAS_EXCEPTIONS=0. Disable the warning if xtree is |
| 791 # not patched. | 797 # not patched. |
| 792 if (!msvs_xtree_patched && | 798 if (!msvs_xtree_patched && |
| 793 exec_script("../../win_is_xtree_patched.py", [], "value") == 0) { | 799 exec_script("../../win_is_xtree_patched.py", [], "value") == 0) { |
| 794 cflags += [ "/wd4702" ] # Unreachable code. | 800 cflags += [ "/wd4702" ] # Unreachable code. |
| 795 } | 801 } |
| (...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1322 if (symbol_level == 0) { | 1328 if (symbol_level == 0) { |
| 1323 configs = [ ":no_symbols" ] | 1329 configs = [ ":no_symbols" ] |
| 1324 } else if (symbol_level == 1) { | 1330 } else if (symbol_level == 1) { |
| 1325 configs = [ ":minimal_symbols" ] | 1331 configs = [ ":minimal_symbols" ] |
| 1326 } else if (symbol_level == 2) { | 1332 } else if (symbol_level == 2) { |
| 1327 configs = [ ":symbols" ] | 1333 configs = [ ":symbols" ] |
| 1328 } else { | 1334 } else { |
| 1329 assert(false) | 1335 assert(false) |
| 1330 } | 1336 } |
| 1331 } | 1337 } |
| OLD | NEW |