build/config/gcc/gcc_version.gni - Issue 375483003: Change Android toolchain to GCC 4.9.

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 375483003: Change Android toolchain to GCC 4.9. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: gn fix (bis) Created 6 years, 3 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 79b11745941bf52814019fca1475b2f4c8e9c955..9b27c9047383c47ac603c7da528fe5f4bf27d2e9 100644

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

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

@@ -5,7 +5,12 @@

if (is_clang) {

gcc_version = 0

} else if (is_android) {

- gcc_version = 48

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

+ if (is_android_webview_build) {

+ gcc_version = 48

+ } else {

+ gcc_version = 49

+ }

} else {

gcc_version = exec_script("../../compiler_version.py", [ "host", "compiler" ], "value")

}

« build/common.gypi ('K') | « build/config/compiler/BUILD.gn ('k') | no next file » | no next file with comments »