Fix host gcc version detection for android webview.
Android WebView builds use a hermetic host toolchain, so detecting the host gcc version with compiler_version doesn't work. Hardcode the current versions used instead. BUG=377684 Review URL: https://codereview.chromium.org/302633006 git-svn-id: http://src.chromium.org/svn/trunk/src/build@272965 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
00187128e2
Коммит
34fba0d9b8
14
common.gypi
14
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,
|
||||
|
|
Загрузка…
Ссылка в новой задаче