Index: third_party/boringssl/boringssl.gyp |
diff --git a/third_party/boringssl/boringssl.gyp b/third_party/boringssl/boringssl.gyp |
index ba87066d8b9758315f71616e3c0d5d85c3f73382..19e3fcb69587710a741a35bdbfc09eb4791f55a7 100644 |
--- a/third_party/boringssl/boringssl.gyp |
+++ b/third_party/boringssl/boringssl.gyp |
@@ -28,7 +28,7 @@ |
['OS == "linux" or OS == "android"', { |
'sources': [ '<@(boringssl_linux_x86_sources)' ], |
}], |
- ['OS != "mac" and OS != "linux"', { |
+ ['OS != "mac" and OS != "linux" and OS != "android"', { |
'defines': [ 'OPENSSL_NO_ASM' ], |
}], |
] |
@@ -44,12 +44,12 @@ |
['OS == "win"', { |
'sources': [ '<@(boringssl_win_x86_64_sources)' ], |
}], |
- ['OS != "mac" and OS != "linux" and OS != "win"', { |
+ ['OS != "mac" and OS != "linux" and OS != "win" and OS != "android"', { |
'defines': [ 'OPENSSL_NO_ASM' ], |
}], |
] |
}], |
- ['target_arch != "arm" and target_arch != "x86" and target_arch != "x64"', { |
+ ['target_arch != "arm" and target_arch != "ia32" and target_arch != "x64"', { |
'defines': [ 'OPENSSL_NO_ASM' ], |
}], |
], |