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