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

Unified Diff: build/common.gypi

Issue 302633006: Fix host gcc version detection for android webview. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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:
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 51d3e572e67fe9d339bc812c0de02ec88be0b306..06c6016b6c784253863d13a344adc2c5406abd43 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1455,7 +1455,6 @@
# 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.
@@ -1463,6 +1462,19 @@
}, {
'gcc_version%': '<!pymod_do_main(compiler_version target compiler)',
}],
+ ['android_webview_build==1', {
+ # Android WebView uses a hermetic toolchain even for host, so set it
+ # manually here.
+ 'conditions': [
+ ['host_os=="mac"', {
+ 'host_gcc_version%': 42,
+ }, { # linux
+ 'host_gcc_version%': 46,
+ }],
+ ],
+ }, { # android_webview_build!=1
+ 'host_gcc_version%': '<!pymod_do_main(compiler_version host compiler)',
+ }],
],
}, {
'host_gcc_version%': 0,
« 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