| 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,
|
|
|