| 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/ccache.gni") | 9 import("//build/toolchain/ccache.gni") |
| 10 | 10 |
| (...skipping 865 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 876 # NaCl's Clang compiler and Chrome's hermetic Clang compiler will almost | 876 # NaCl's Clang compiler and Chrome's hermetic Clang compiler will almost |
| 877 # always have different versions. Certain flags may not be recognized by | 877 # always have different versions. Certain flags may not be recognized by |
| 878 # one version or the other. | 878 # one version or the other. |
| 879 if (!is_nacl) { | 879 if (!is_nacl) { |
| 880 # Flags NaCl (Clang 3.7) does not recognize. | 880 # Flags NaCl (Clang 3.7) does not recognize. |
| 881 cflags += [ | 881 cflags += [ |
| 882 # TODO(thakis): Enable this, crbug.com/507717 | 882 # TODO(thakis): Enable this, crbug.com/507717 |
| 883 "-Wno-shift-negative-value", | 883 "-Wno-shift-negative-value", |
| 884 ] | 884 ] |
| 885 } | 885 } |
| 886 | |
| 887 if (exec_script("//tools/clang/scripts/update.py", | |
| 888 [ "--print-revision" ], | |
| 889 "trim string") != "257955-1") { | |
| 890 cflags += [ | |
| 891 # TODO(thakis): Remove once | |
| 892 # https://chromium-review.googlesource.com/#/c/324860/ is in. | |
| 893 "-Wno-constant-conversion", | |
| 894 ] | |
| 895 } | |
| 896 } | 886 } |
| 897 } | 887 } |
| 898 | 888 |
| 899 # chromium_code --------------------------------------------------------------- | 889 # chromium_code --------------------------------------------------------------- |
| 900 # | 890 # |
| 901 # Toggles between higher and lower warnings for code that is (or isn't) | 891 # Toggles between higher and lower warnings for code that is (or isn't) |
| 902 # part of Chromium. | 892 # part of Chromium. |
| 903 | 893 |
| 904 config("chromium_code") { | 894 config("chromium_code") { |
| 905 if (is_win) { | 895 if (is_win) { |
| (...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1308 if (symbol_level == 0) { | 1298 if (symbol_level == 0) { |
| 1309 configs = [ ":no_symbols" ] | 1299 configs = [ ":no_symbols" ] |
| 1310 } else if (symbol_level == 1) { | 1300 } else if (symbol_level == 1) { |
| 1311 configs = [ ":minimal_symbols" ] | 1301 configs = [ ":minimal_symbols" ] |
| 1312 } else if (symbol_level == 2) { | 1302 } else if (symbol_level == 2) { |
| 1313 configs = [ ":symbols" ] | 1303 configs = [ ":symbols" ] |
| 1314 } else { | 1304 } else { |
| 1315 assert(false) | 1305 assert(false) |
| 1316 } | 1306 } |
| 1317 } | 1307 } |
| OLD | NEW |