Index: third_party/boringssl/boringssl.gyp |
diff --git a/third_party/boringssl/boringssl.gyp b/third_party/boringssl/boringssl.gyp |
index 19456fc69e268d76f751b4d28bf8a389e6b96489..b6c2a27d3f834cea26019388e19364bbe478f4e4 100644 |
--- a/third_party/boringssl/boringssl.gyp |
+++ b/third_party/boringssl/boringssl.gyp |
@@ -36,6 +36,13 @@ |
}], |
], |
}], |
+ ['target_arch == "arm" and clang == 1', { |
+ # TODO(hans) Enable integrated-as (crbug.com/124610). |
+ 'cflags': [ |
+ '-fno-integrated-as', |
+ '-B<(android_toolchain)', # Else /usr/bin/as gets picked up. |
+ ], |
+ }], |
['target_arch == "arm64" and msan == 0', { |
'conditions': [ |
['OS == "linux" or OS == "android"', { |