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

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

BUG=330631
R=torne@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=244615

[Nico, 2014-01-12 23:50:46]

https://codereview.chromium.org/136073002/diff/40001/build/common.gypi
File build/common.gypi (left):

https://codereview.chromium.org/136073002/diff/40001/build/common.gypi#oldcod...
build/common.gypi:3833: '-Wno-error=c++0x-compat',
(I'm hoping the trybots will tell me if removing this isn't right.)

[Torne, 2014-01-13 18:41:56]

Are we really using gcc 4.6 to build Chrome on Android? I thought the latest NDK
toolchain was 4.7...

Also, the WebView uses whatever is the default toolchain for the Android release
it's being compiled against (since it doesn't use the NDK), which on at least
some branches is 4.8...

[Nico, 2014-01-13 18:42:43]

On 2014/01/13 18:41:56, Torne wrote:
> Are we really using gcc 4.6 to build Chrome on Android? I thought the latest
NDK
> toolchain was 4.7...
> 
> Also, the WebView uses whatever is the default toolchain for the Android
release
> it's being compiled against (since it doesn't use the NDK), which on at least
> some branches is 4.8...

I have no idea. Note that this patch doesn't change behavior.

I can change it to 4.7 or anything you like, but that's independent of this CL.

[Torne, 2014-01-13 19:34:13]

On 2014/01/13 18:42:43, Nico wrote:
> On 2014/01/13 18:41:56, Torne wrote:
> > Are we really using gcc 4.6 to build Chrome on Android? I thought the latest
> NDK
> > toolchain was 4.7...
> > 
> > Also, the WebView uses whatever is the default toolchain for the Android
> release
> > it's being compiled against (since it doesn't use the NDK), which on at
least
> > some branches is 4.8...
> 
> I have no idea. Note that this patch doesn't change behavior.
> 
> I can change it to 4.7 or anything you like, but that's independent of this
CL.

Oh, sorry. I misread what this change was doing. I guess it can stay as 46 until
someone points out why it needs to change, then..

LGTM

[Nico, 2014-01-13 19:41:24]

Thanks!

[commit-bot: I haz the power, 2014-01-13 19:43:17]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thakis@chromium.org/136073002/40001

[Nico, 2014-01-14 00:14:55]

Committed patchset #2 manually as r244615 (presubmit successful).

[commit-bot: I haz the power, 2014-01-14 00:42:55]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thakis@chromium.org/136073002/40001

[commit-bot: I haz the power, 2014-01-14 00:42:58]

Failed to apply patch for build/android/envsetup_functions.sh:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file build/android/envsetup_functions.sh
  Hunk #1 FAILED at 44.
  Hunk #2 FAILED at 86.
  2 out of 2 hunks FAILED -- saving rejects to file
build/android/envsetup_functions.sh.rej

Patch:       build/android/envsetup_functions.sh
Index: build/android/envsetup_functions.sh
diff --git a/build/android/envsetup_functions.sh
b/build/android/envsetup_functions.sh
index
29cf44f19b8ca2288236859104f1c899bc8226b2..612e154cd2bb43ccd525342d9e435f14e19ce16c
100755
--- a/build/android/envsetup_functions.sh
+++ b/build/android/envsetup_functions.sh
@@ -44,9 +44,6 @@ common_vars_defines() {
   esac
 
   toolchain_version="4.6"
-  # We directly set the gcc_version since we know what we use, and it should
-  # be set to xx instead of x.x. Refer the output of compiler_version.py.
-  gcc_version="46"
   toolchain_target=$(basename \
     ${ANDROID_NDK_ROOT}/toolchains/${toolchain_arch}-${toolchain_version})
   toolchain_path="${ANDROID_NDK_ROOT}/toolchains/${toolchain_target}"\
@@ -86,7 +83,6 @@ ${ANDROID_SDK_BUILD_TOOLS_VERSION}
   # to canonicalize them (remove double '/', remove trailing '/', etc).
   DEFINES="OS=android"
   DEFINES+=" host_os=${host_os}"
-  DEFINES+=" gcc_version=${gcc_version}"
 
   if [[ -n "$CHROME_ANDROID_OFFICIAL_BUILD" ]]; then
     DEFINES+=" branding=Chrome"