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

Unified Diff: build/common.gypi

Issue 249303004: Fixed host_gcc_version for Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 52a91e30392da630a489f467da72539eb8f1407c..93d9aff278739b16668d22a79bea962dd51f18d7 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1385,20 +1385,18 @@
# TODO(glider): set clang to 1 earlier for ASan and TSan builds so that
# it takes effect here.
['os_posix==1 and OS!="mac" and OS!="ios" and clang==0 and asan==0 and lsan==0 and tsan==0 and msan==0', {
+ 'host_gcc_version%': '<!pymod_do_main(compiler_version host compiler)',
'conditions': [
['OS=="android"', {
# We directly set the gcc versions since we know what we use.
'conditions': [
['target_arch=="x64" or target_arch=="arm64"', {
- 'host_gcc_version%': 48,
'gcc_version%': 48,
}, {
- 'host_gcc_version%': 46,
'gcc_version%': 46,
}],
],
}, {
- 'host_gcc_version%': '<!pymod_do_main(compiler_version host compiler)',
'gcc_version%': '<!pymod_do_main(compiler_version target compiler)',
}],
],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698