| Index: build/config/compiler/BUILD.gn
|
| diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
|
| index 5323c6e4cb8132d29b0f131f0e05abcb9672d27d..619c1b9d127896bc515e20868f0106d0c6e8b197 100644
|
| --- a/build/config/compiler/BUILD.gn
|
| +++ b/build/config/compiler/BUILD.gn
|
| @@ -163,7 +163,9 @@ config("compiler") {
|
| } else if (is_posix && !is_chromeos && !is_nacl) {
|
| # TODO(phajdan.jr): Use -fstack-protector-strong when our gcc supports it.
|
| cflags += [ "--param=ssp-buffer-size=4" ]
|
| - if (is_android && (current_cpu == "arm64" || current_cpu == "x86")) {
|
| +
|
| + # The x86 toolchain currently has problems with stack-protector.
|
| + if (is_android && current_cpu == "x86") {
|
| cflags += [ "-fno-stack-protector" ]
|
| } else {
|
| cflags += [ "-fstack-protector" ]
|
|
|