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

Unified Diff: build/common.gypi

Issue 516723004: Update host compiler version info for android webview. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 ea388ac7d32cddc309dab352aa908d8cab23e5f3..188b1acc58b1d0559b0b60cc39ec8fd12ff08344 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -627,15 +627,11 @@
# build only explicitly selected platforms.
'ozone_auto_platforms%': 1,
+ # If this is set clang is used as host compiler, but not as target
+ # compiler. Always do this by default.
+ 'host_clang%': 1,
+
'conditions': [
- ['android_webview_build==0', {
- # If this is set clang is used as host compiler, but not as target
- # compiler. Always do this by default, except when building for AOSP.
- 'host_clang%': 1,
- }, {
- # See http://crbug.com/377684
- 'host_clang%': 0,
- }],
# A flag for POSIX platforms
['OS=="win"', {
'os_posix%': 0,
@@ -1547,15 +1543,8 @@
'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 uses a hermetic clang toolchain for host builds.
+ 'host_gcc_version%': 0,
}, { # android_webview_build!=1
'host_gcc_version%': '<!pymod_do_main(compiler_version host 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