Roll src/third_party/android_tools 5722f90:6957ab0

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index db723bc02d43e2e2cc9d55a736acc0c362435d72..75e6b0fca019e6954b8ed396b6dddba42112d8cb 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -3956,11 +3956,16 @@
                   '-m32',
                 ],
                 'conditions': [
-                  # Use gold linker for Android ia32 target.
                   ['OS=="android"', {
+                    # Use gold linker for Android ia32 target.
                     'ldflags': [
                       '-fuse-ld=gold',
                     ],
+                    # Use -mstackrealign due to a bug on ia32 Jelly Bean.
+                    # See crbug.com/521527

[Nico, 2015/08/18 23:24:52]

https://android-review.googlesource.com/#/c/110770/ sounds like the NDK expects
things to work without this flag. Why do we need this flag?

[Fabrice (no longer in Chrome), 2015/08/18 23:30:59]

My best guess is that there is something wrong in one of our x86 assembly files
and the stack gets misaligned at some point. That seems to trigger a crash on
Android x86 Jelly Bean, but not on any other Android x86 versions. Maybe there
is also something wrong with x86 JB system libraries? I honestly am not familiar
enough with the x86 ABI to figure it out and the bug also causes the stack trace
to become garbage, making tracking the underlying issue hard.

[Nico, 2015/08/18 23:35:59]

Shouldn't the comment be more along the lines of "Figure out why this is needed,
fix, and remove this flag" then?

+                    'cflags': [
+                      '-mstackrealign',
+                    ],
                   }],
                 ],
               }],