| Index: third_party/boringssl/BUILD.gn
|
| diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
|
| index f4114d9685ce0824ebba5dc60f52e523d2360cc7..706ce6a57da189f4ef181b7a3b107ccbe90a9089 100644
|
| --- a/third_party/boringssl/BUILD.gn
|
| +++ b/third_party/boringssl/BUILD.gn
|
| @@ -2,6 +2,7 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| +import("//build/config/android/config.gni")
|
| import("//build/config/sanitizers/sanitizers.gni")
|
|
|
| # Config for us and everybody else depending on BoringSSL.
|
| @@ -67,6 +68,16 @@ component("boringssl") {
|
| # Also gets the include dirs from :openssl_config
|
| include_dirs = [ "src/include" ]
|
|
|
| + if (current_cpu == "arm" && is_clang) {
|
| + # TODO(hans) Enable integrated-as (crbug.com/124610).
|
| + rebased_android_toolchain_root =
|
| + rebase_path(android_toolchain_root, root_build_dir)
|
| + asmflags = [
|
| + "-fno-integrated-as",
|
| + "-B${rebased_android_toolchain_root}/bin", # Else /usr/bin/as gets picked up.
|
| + ]
|
| + }
|
| +
|
| if (is_msan) {
|
| defines += [ "OPENSSL_NO_ASM" ]
|
| } else if (current_cpu == "x64") {
|
|
|