android: Set gcc_version in build/common.gypi instead of in envsetup.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 8dc8352ca9ec7f0c2f0ea93b514c0bf72a6fe005..a3017348601723fa8a215ec39169c1b83d4ac76f 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1259,7 +1259,14 @@
       # 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', {
-        'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
+        'conditions': [
+          ['OS=="android"', {
+            # We directly set the gcc_version since we know what we use.
+            'gcc_version%': 46,
+          }, {
+            'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
+          }],
+        ],
       }, {
         'gcc_version%': 0,
       }],
@@ -3826,11 +3833,6 @@
                   '-Wno-type-limits',
                 ],
                 'cflags_cc': [
-                  # Disabling c++0x-compat should be handled in WebKit, but
-                  # this currently doesn't work because gcc_version is not set
-                  # correctly when building with the Android build system.
-                  # TODO(torne): Fix this in WebKit.
-                  '-Wno-error=c++0x-compat',

[Nico, 2014/01/12 23:50:47]

(I'm hoping the trybots will tell me if removing this isn't right.)

                   # Other things unrelated to -Wextra:
                   '-Wno-non-virtual-dtor',
                   '-Wno-sign-promo',