From ed51a58fb7366557e5dc3b874aa9821d8c5d5343 Mon Sep 17 00:00:00 2001
From: torne <torne@chromium.org>
Date: Thu, 28 Aug 2014 11:28:17 -0700
Subject: [PATCH] Update host compiler version info for android webview.

The android webview build now uses clang when building for host; update
the gyp variables appropriately to make sure we use reasonable compiler
flags.

BUG=377684

Review URL: https://codereview.chromium.org/516723004

Cr-Commit-Position: refs/heads/master@{#292418}
---
 build/common.gypi | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/build/common.gypi b/build/common.gypi
index ea388ac7d32c..188b1acc58b1 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)',
           }],
-- 
2.11.4.GIT