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

Side by Side Diff: build/config/gcc/gcc_version.gni

Issue 1043913002: Remove most android_webview_build conditions from build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments and rebase Created 5 years, 8 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
« no previous file with comments | « build/config/features.gni ('k') | build/config/sysroot.gni » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 if (is_android) { 5 if (is_android) {
6 import("//build/config/android/config.gni") 6 gcc_version = 49
7 if (is_android_webview_build) {
8 gcc_version = 48
9 } else {
10 gcc_version = 49
11 }
12 } else if (current_toolchain == "//build/toolchain/cros:target" || 7 } else if (current_toolchain == "//build/toolchain/cros:target" ||
13 current_toolchain == "//build/toolchain/linux:mipsel") { 8 current_toolchain == "//build/toolchain/linux:mipsel") {
14 gcc_version = exec_script("../../compiler_version.py", 9 gcc_version = exec_script("../../compiler_version.py",
15 [ 10 [
16 "target", 11 "target",
17 "compiler", 12 "compiler",
18 ], 13 ],
19 "value") 14 "value")
20 } else if (current_toolchain == "//build/toolchain/linux:x64" || 15 } else if (current_toolchain == "//build/toolchain/linux:x64" ||
21 current_toolchain == "//build/toolchain/linux:x86") { 16 current_toolchain == "//build/toolchain/linux:x86") {
22 # These are both the same and just use the default gcc on the system. 17 # These are both the same and just use the default gcc on the system.
23 gcc_version = exec_script("../../compiler_version.py", 18 gcc_version = exec_script("../../compiler_version.py",
24 [ 19 [
25 "host", 20 "host",
26 "compiler", 21 "compiler",
27 ], 22 ],
28 "value") 23 "value")
29 } else { 24 } else {
30 gcc_version = 0 25 gcc_version = 0
31 } 26 }
OLDNEW
« no previous file with comments | « build/config/features.gni ('k') | build/config/sysroot.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698