build/config/gcc/gcc_version.gni - Issue 1124763003: Update from https://crrev.com/327068

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/config/gcc/gcc_version.gni

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 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:

Index: build/config/gcc/gcc_version.gni

diff --git a/build/config/gcc/gcc_version.gni b/build/config/gcc/gcc_version.gni

index f5c1c1aee0f3b7c348b2f2899b7c3e85e5d68fa0..6741e45bf39104ab6180da6c1b40b3780c14b40d 100644

--- a/build/config/gcc/gcc_version.gni

+++ b/build/config/gcc/gcc_version.gni

@@ -3,12 +3,7 @@

# found in the LICENSE file.

if (is_android) {

- import("//build/config/android/config.gni")

- if (is_android_webview_build) {

- gcc_version = 48

- } else {

- gcc_version = 49

- }

+ gcc_version = 49

} else if (current_toolchain == "//build/toolchain/cros:target" ||

current_toolchain == "//build/toolchain/linux:mipsel") {

gcc_version = exec_script("../../compiler_version.py",